From 1f428192341f9ed46257a71469e5b0a13f88c74b Mon Sep 17 00:00:00 2001
From: Eric Antones <eantones@nuobit.com>
Date: Mon, 23 Mar 2026 23:49:54 +0100
Subject: [PATCH 1/2] [REF] rental_base_extension: move rental_base-dependent
 code from sale_rental_extension

sale_rental_extension referenced rental_base XML IDs (views, menus,
rental_sale_type) and sale_order_type fields (type_id) without declaring
rental_base as a dependency. Instead of adding coupling, move all
rental_base-dependent code to rental_base_extension where it belongs.

Moved from sale_rental_extension:
- SaleOrder model (rental status tracking, is_rental_order, picking helpers)
- StockPicking model (is_rental_picking, sign-to-validate)
- ResCompany and ResConfigSettings (signature terms)
- Dedicated rental form/tree/kanban/calendar/search views and actions
- Rental app menus and rental_base view deactivations
- Config settings view, stock picking view, delivery slip report
- JS signature widget, SCSS kanban styles, XML signature dialog
- Rental status tests

All XML IDs, view names, file names and internal identifiers follow
OCA naming conventions (sale_order_view_form_rental, sale_order_action_rental,
sale_order_menu_rental, etc.).
---
 rental_base_extension/README.rst              |  40 +-
 rental_base_extension/__init__.py             |   1 +
 rental_base_extension/__manifest__.py         |  17 +-
 rental_base_extension/i18n/ca.po              | 254 +++++++
 rental_base_extension/i18n/es.po              | 254 +++++++
 rental_base_extension/models/__init__.py      |   4 +
 rental_base_extension/models/res_company.py   |  14 +
 .../models/res_config_settings.py             |  18 +
 rental_base_extension/models/sale_order.py    | 134 ++++
 rental_base_extension/models/stock_picking.py |  41 ++
 rental_base_extension/readme/DESCRIPTION.rst  |  40 +-
 .../report/report_deliveryslip.xml            |  41 ++
 .../static/description/index.html             |  37 +-
 .../static/src/js/.eslintrc.yml               |   2 +
 .../static/src/js/signature_widget.js         |  66 ++
 .../static/src/scss/rental_kanban.scss        |   9 +
 .../static/src/xml/signature_dialog.xml       |  39 ++
 rental_base_extension/tests/__init__.py       |   1 +
 .../tests/test_rental_status.py               | 156 +++++
 .../views/res_config_settings_views.xml       |  56 ++
 .../views/sale_order_views.xml                | 661 ++++++++++++++++++
 .../views/stock_picking_views.xml             | 108 +++
 22 files changed, 1960 insertions(+), 33 deletions(-)
 create mode 100644 rental_base_extension/models/__init__.py
 create mode 100644 rental_base_extension/models/res_company.py
 create mode 100644 rental_base_extension/models/res_config_settings.py
 create mode 100644 rental_base_extension/models/sale_order.py
 create mode 100644 rental_base_extension/models/stock_picking.py
 create mode 100644 rental_base_extension/report/report_deliveryslip.xml
 create mode 100644 rental_base_extension/static/src/js/.eslintrc.yml
 create mode 100644 rental_base_extension/static/src/js/signature_widget.js
 create mode 100644 rental_base_extension/static/src/scss/rental_kanban.scss
 create mode 100644 rental_base_extension/static/src/xml/signature_dialog.xml
 create mode 100644 rental_base_extension/tests/__init__.py
 create mode 100644 rental_base_extension/tests/test_rental_status.py
 create mode 100644 rental_base_extension/views/res_config_settings_views.xml
 create mode 100644 rental_base_extension/views/sale_order_views.xml
 create mode 100644 rental_base_extension/views/stock_picking_views.xml

diff --git a/rental_base_extension/README.rst b/rental_base_extension/README.rst
index f5a320ea6..2e7845c59 100644
--- a/rental_base_extension/README.rst
+++ b/rental_base_extension/README.rst
@@ -26,24 +26,44 @@ Rental Base Extension
 
 |badge1| |badge2| |badge3|
 
-This module extends ``rental_base`` to improve the rental order experience
-with better menu visibility and product filtering.
+This module extends ``rental_base`` to provide a complete rental order
+management experience.
+
+Dedicated rental views
+~~~~~~~~~~~~~~~~~~~~~~
+
+Replaces the default sale order views with dedicated rental-specific views:
+form, tree, kanban, calendar and search. The form view hides non-rental fields
+and adds rental period, duration and status badges. Actions set the rental sale
+type by default.
+
+Rental status tracking
+~~~~~~~~~~~~~~~~~~~~~~
+
+Adds computed ``rental_status`` on sale orders based on the state of the
+underlying ``sale.rental`` records: draft, pickup, return, returned and cancel.
+A "late" indicator warns when the next action date has passed.
 
 Rental Positions menu
 ~~~~~~~~~~~~~~~~~~~~~
 
-The ``rental_base`` module places the Rental Positions screen (the ``sale.rental``
-list) under Configuration and restricts it to debug mode. This module moves it
-to the top level of the Rentals menu as the first entry, visible to all sales
-users, since it is the primary screen for tracking rental status.
+The ``rental_base`` module places the Rental Positions screen under
+Configuration and restricts it to debug mode. This module moves it to the
+top level of the Rentals menu as the first entry, visible to all sales users.
 
 Product filter on rental order lines
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When creating a rental order, the product dropdown on order lines only shows
-rental service products (i.e. products linked to a rented physical product
-via ``rented_product_id``). This prevents users from accidentally selecting
-non-rental products on rental orders.
+When creating a rental order, the product dropdown only shows rental service
+products, preventing users from accidentally selecting non-rental products.
+
+Signature and delivery
+~~~~~~~~~~~~~~~~~~~~~~
+
+Configurable signature terms for rental delivery orders (Settings → Rental →
+Signature). When enabled, the Validate button is replaced by a Sign button
+that auto-validates on signature. The signed conditions appear on the delivery
+slip PDF.
 
 Catalan and Spanish translations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/rental_base_extension/__init__.py b/rental_base_extension/__init__.py
index e69de29bb..0650744f6 100644
--- a/rental_base_extension/__init__.py
+++ b/rental_base_extension/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/rental_base_extension/__manifest__.py b/rental_base_extension/__manifest__.py
index 54fa78a22..2fc4f298a 100644
--- a/rental_base_extension/__manifest__.py
+++ b/rental_base_extension/__manifest__.py
@@ -3,9 +3,9 @@
 
 {
     "name": "Rental Base Extension",
-    "summary": "Improves rental product form with checkbox visibility,"
-    " rental sections and translations.",
-    "version": "16.0.1.0.0",
+    "summary": "Dedicated rental views, rental status tracking,"
+    " kanban, calendar, configurable signature terms and translations.",
+    "version": "16.0.2.0.0",
     "development_status": "Alpha",
     "category": "Rental",
     "author": "NuoBiT Solutions SL",
@@ -15,6 +15,17 @@
         "rental_base",
     ],
     "data": [
+        "report/report_deliveryslip.xml",
         "views/product_views.xml",
+        "views/sale_order_views.xml",
+        "views/res_config_settings_views.xml",
+        "views/stock_picking_views.xml",
     ],
+    "assets": {
+        "web.assets_backend": [
+            "rental_base_extension/static/src/js/signature_widget.js",
+            "rental_base_extension/static/src/scss/rental_kanban.scss",
+            "rental_base_extension/static/src/xml/signature_dialog.xml",
+        ],
+    },
 }
diff --git a/rental_base_extension/i18n/ca.po b/rental_base_extension/i18n/ca.po
index afc86479c..4c43e4d98 100644
--- a/rental_base_extension/i18n/ca.po
+++ b/rental_base_extension/i18n/ca.po
@@ -1,6 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # 	* rental_base
+# 	* rental_base_extension
 #
 msgid ""
 msgstr ""
@@ -384,6 +385,7 @@ msgstr ""
 
 #. module: rental_base
 #: model:ir.model.fields,field_description:rental_base.field_update_sale_line_date__order_id
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
 msgid "Order"
 msgstr "Comanda"
 
@@ -414,6 +416,8 @@ msgstr "Temps de lloguer demanat"
 
 #. module: rental_base
 #: model:ir.ui.menu,name:rental_base.menu_customer_orders
+#: model:ir.ui.menu,name:rental_base_extension.sale_order_menu_rental
+#: model:ir.ui.menu,name:rental_base_extension.sale_order_menu_rental_orders
 msgid "Orders"
 msgstr "Comandes"
 
@@ -490,6 +494,7 @@ msgstr "Comanda de lloguer"
 #. module: rental_base
 #: model:ir.actions.act_window,name:rental_base.action_rental_orders
 #: model:ir.ui.menu,name:rental_base.menu_rental_orders
+#: model:ir.actions.act_window,name:rental_base_extension.sale_order_action_rental
 msgid "Rental Orders"
 msgstr "Comandes de lloguer"
 
@@ -597,6 +602,7 @@ msgstr "Actualitzar data de les línies de comanda de venda<lu>"
 #: model:ir.actions.act_window,name:rental_base.action_update_sale_line_date
 #: model_terms:ir.ui.view,arch_db:rental_base.update_sale_line_date_form
 #: model_terms:ir.ui.view,arch_db:rental_base.view_order_form
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
 msgid "Update Times"
 msgstr "Actualitzar temps"
 
@@ -651,3 +657,251 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rental_base_extension.product_template_only_form_view
 msgid "Create Rental Service"
 msgstr "Crear servei de lloguer"
+
+#. module: rental_base_extension
+#. odoo-javascript
+#: code:addons/rental_base_extension/static/src/js/signature_widget.js:0
+#, python-format
+msgid "Delivery Signature"
+msgstr "Signatura de lliurament"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_res_company__rental_signature_terms
+#: model:ir.model.fields,field_description:rental_base_extension.field_res_config_settings__rental_signature_terms
+msgid "Rental Signature Terms"
+msgstr "Condicions de signatura de lloguer"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.report_delivery_document_rental_signature_terms
+msgid "Conditions"
+msgstr "Condicions"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.report_delivery_document_rental_signature_terms
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.res_config_settings_view_form
+msgid "Signature"
+msgstr "Signatura"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.res_config_settings_view_form
+msgid ""
+"Terms shown in the signature dialog when signing a rental delivery order. "
+"Leave empty to use the default text."
+msgstr ""
+"Condicions mostrades al diàleg de signatura en signar un albarà de lloguer. "
+"Deixeu buit per utilitzar el text per defecte."
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__draft
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Quotation"
+msgstr "Pressupost"
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__sent
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Quotation Sent"
+msgstr "Pressupost enviat"
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__pickup
+msgid "Reserved"
+msgstr "Reservat"
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__return
+msgid "Pickedup"
+msgstr "Recollit"
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__returned
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Returned"
+msgstr "Tornat"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Booked"
+msgstr "Reservat"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Late Pickup"
+msgstr "Recollida amb retard"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Picked-up"
+msgstr "Recollit"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Late Return"
+msgstr "Retorn amb retard"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "To Pickup"
+msgstr "Per recollir"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "To Return"
+msgstr "Per retornar"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__rental_duration
+msgid "Duration"
+msgstr "Durada"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__rental_status
+msgid "Rental Status"
+msgstr "Estat del lloguer"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Rental Period"
+msgstr "Període de lloguer"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Search Rental Orders"
+msgstr "Cerca comandes de lloguer"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "My Orders"
+msgstr "Les meves comandes"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+#: model:ir.ui.menu,name:rental_base_extension.sale_order_menu_rental_today
+msgid "To Do Today"
+msgstr "Avui"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_kanban_rental
+msgid "Late"
+msgstr "Retard"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Pickup Date"
+msgstr "Data de recollida"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Return Date"
+msgstr "Data de devolució"
+
+#. module: rental_base_extension
+#: model:ir.actions.act_window,name:rental_base_extension.sale_order_action_rental_today_pickup
+msgid "Pickups Today"
+msgstr "Recollides avui"
+
+#. module: rental_base_extension
+#: model:ir.actions.act_window,name:rental_base_extension.sale_order_action_rental_today_return
+msgid "Returns Today"
+msgstr "Devolucions avui"
+
+#. module: rental_base_extension
+#: model:ir.ui.menu,name:rental_base_extension.sale_order_menu_rental_today_pickup
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Pickup"
+msgstr "Recollida"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Qty"
+msgstr "Qtat"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_action_rental
+msgid "Create a new rental order!"
+msgstr "Crea una nova comanda de lloguer!"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_kanban_rental
+msgid "Pickup:"
+msgstr "Recollida:"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_kanban_rental
+msgid "Return:"
+msgstr "Retorn:"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_kanban_rental
+msgid "<i class=\"fa fa-warning me-1\" title=\"Late\"/>"
+msgstr "<i class=\"fa fa-warning me-1\" title=\"Endarrerit\"/>"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__is_late
+msgid "Is Late"
+msgstr "Endarrerit"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__is_rental_order
+msgid "Is Rental Order"
+msgstr "És comanda de lloguer"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_stock_picking__is_rental_picking
+msgid "Is Rental Picking"
+msgstr "És albarà de lloguer"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__next_action_date
+msgid "Next Action Date"
+msgstr "Data propera acció"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__pickup_picking_id
+msgid "Pickup Picking"
+msgstr "Albarà de recollida"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__return_picking_id
+msgid "Return Picking"
+msgstr "Albarà de retorn"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_res_company__rental_require_signature_validation
+#: model:ir.model.fields,field_description:rental_base_extension.field_res_config_settings__rental_require_signature_validation
+#: model:ir.model.fields,field_description:rental_base_extension.field_stock_picking__rental_require_signature_validation
+msgid "Rental Require Signature Validation"
+msgstr "Requerir signatura per validar lloguer"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.res_config_settings_view_form
+msgid "Require Signature to Validate Delivery"
+msgstr "Requerir signatura per validar l'entrega"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.res_config_settings_view_form
+msgid "When enabled, rental delivery orders can only be validated by signing. The Validate button is replaced by the Sign button."
+msgstr "Si s'activa, les entregues de lloguer només es poden validar amb signatura. El botó Validar se substitueix pel botó Signar."
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.view_picking_form
+msgid "Sign"
+msgstr "Signar"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Salesperson"
+msgstr "Comercial"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Status"
+msgstr "Estat"
+
+#. module: rental_base_extension
+#. odoo-javascript
+#: code:addons/rental_base_extension/static/src/xml/signature_dialog.xml:0
+#, python-format
+msgid "Confirm & Sign"
+msgstr "Confirmar i signar"
diff --git a/rental_base_extension/i18n/es.po b/rental_base_extension/i18n/es.po
index 510a3b1f8..b90ac5f2c 100644
--- a/rental_base_extension/i18n/es.po
+++ b/rental_base_extension/i18n/es.po
@@ -1,6 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # 	* rental_base
+# 	* rental_base_extension
 #
 msgid ""
 msgstr ""
@@ -394,6 +395,7 @@ msgstr ""
 
 #. module: rental_base
 #: model:ir.model.fields,field_description:rental_base.field_update_sale_line_date__order_id
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
 msgid "Order"
 msgstr "Pedido"
 
@@ -424,6 +426,8 @@ msgstr "Tiempo de alquiler pedido"
 
 #. module: rental_base
 #: model:ir.ui.menu,name:rental_base.menu_customer_orders
+#: model:ir.ui.menu,name:rental_base_extension.sale_order_menu_rental
+#: model:ir.ui.menu,name:rental_base_extension.sale_order_menu_rental_orders
 msgid "Orders"
 msgstr "Pedidos"
 
@@ -500,6 +504,7 @@ msgstr "Pedido de alquiler"
 #. module: rental_base
 #: model:ir.actions.act_window,name:rental_base.action_rental_orders
 #: model:ir.ui.menu,name:rental_base.menu_rental_orders
+#: model:ir.actions.act_window,name:rental_base_extension.sale_order_action_rental
 msgid "Rental Orders"
 msgstr "Pedidos de alquiler"
 
@@ -607,6 +612,7 @@ msgstr "Actualizar fecha de las líneas de pedido de venta<lu>"
 #: model:ir.actions.act_window,name:rental_base.action_update_sale_line_date
 #: model_terms:ir.ui.view,arch_db:rental_base.update_sale_line_date_form
 #: model_terms:ir.ui.view,arch_db:rental_base.view_order_form
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
 msgid "Update Times"
 msgstr "Actualizar tiempos"
 
@@ -663,3 +669,251 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rental_base_extension.product_template_only_form_view
 msgid "Create Rental Service"
 msgstr "Crear servicio de alquiler"
+
+#. module: rental_base_extension
+#. odoo-javascript
+#: code:addons/rental_base_extension/static/src/js/signature_widget.js:0
+#, python-format
+msgid "Delivery Signature"
+msgstr "Firma de entrega"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_res_company__rental_signature_terms
+#: model:ir.model.fields,field_description:rental_base_extension.field_res_config_settings__rental_signature_terms
+msgid "Rental Signature Terms"
+msgstr "Condiciones de firma de alquiler"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.report_delivery_document_rental_signature_terms
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.report_delivery_document_rental_signature_terms
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.res_config_settings_view_form
+msgid "Signature"
+msgstr "Firma"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.res_config_settings_view_form
+msgid ""
+"Terms shown in the signature dialog when signing a rental delivery order. "
+"Leave empty to use the default text."
+msgstr ""
+"Condiciones mostradas en el diálogo de firma al firmar un albarán de alquiler. "
+"Dejar vacío para utilizar el texto por defecto."
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__draft
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__sent
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Quotation Sent"
+msgstr "Presupuesto enviado"
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__pickup
+msgid "Reserved"
+msgstr "Reservado"
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__return
+msgid "Pickedup"
+msgstr "Recogida"
+
+#. module: rental_base_extension
+#: model:ir.model.fields.selection,name:rental_base_extension.selection__sale_order__rental_status__returned
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Returned"
+msgstr "Devuelto"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Booked"
+msgstr "Reservado"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Late Pickup"
+msgstr "Recogida con retraso"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Picked-up"
+msgstr "Recogida"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Late Return"
+msgstr "Retorno con retraso"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "To Pickup"
+msgstr "Por recoger"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "To Return"
+msgstr "Por devolver"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__rental_duration
+msgid "Duration"
+msgstr "Duración"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__rental_status
+msgid "Rental Status"
+msgstr "Estado de alquiler"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Rental Period"
+msgstr "Periodo de alquiler"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Search Rental Orders"
+msgstr "Buscar órdenes de alquiler"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "My Orders"
+msgstr "Mis pedidos"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+#: model:ir.ui.menu,name:rental_base_extension.sale_order_menu_rental_today
+msgid "To Do Today"
+msgstr "Hoy"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_kanban_rental
+msgid "Late"
+msgstr "Retraso"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Pickup Date"
+msgstr "Fecha de recogida"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Return Date"
+msgstr "Fecha de retorno"
+
+#. module: rental_base_extension
+#: model:ir.actions.act_window,name:rental_base_extension.sale_order_action_rental_today_pickup
+msgid "Pickups Today"
+msgstr "Recogidas hoy"
+
+#. module: rental_base_extension
+#: model:ir.actions.act_window,name:rental_base_extension.sale_order_action_rental_today_return
+msgid "Returns Today"
+msgstr "Devoluciones hoy"
+
+#. module: rental_base_extension
+#: model:ir.ui.menu,name:rental_base_extension.sale_order_menu_rental_today_pickup
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Pickup"
+msgstr "Recogida"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_form_rental
+msgid "Qty"
+msgstr "Ctd"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_action_rental
+msgid "Create a new rental order!"
+msgstr "¡Crea una nueva orden de alquiler!"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_kanban_rental
+msgid "Pickup:"
+msgstr "Recogida:"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_kanban_rental
+msgid "Return:"
+msgstr "Retorno:"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_kanban_rental
+msgid "<i class=\"fa fa-warning me-1\" title=\"Late\"/>"
+msgstr "<i class=\"fa fa-warning me-1\" title=\"Atrasado\"/>"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__is_late
+msgid "Is Late"
+msgstr "Atrasado"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__is_rental_order
+msgid "Is Rental Order"
+msgstr "Es pedido de alquiler"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_stock_picking__is_rental_picking
+msgid "Is Rental Picking"
+msgstr "Es albarán de alquiler"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__next_action_date
+msgid "Next Action Date"
+msgstr "Fecha próxima acción"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__pickup_picking_id
+msgid "Pickup Picking"
+msgstr "Albarán de recogida"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__return_picking_id
+msgid "Return Picking"
+msgstr "Albarán de retorno"
+
+#. module: rental_base_extension
+#: model:ir.model.fields,field_description:rental_base_extension.field_res_company__rental_require_signature_validation
+#: model:ir.model.fields,field_description:rental_base_extension.field_res_config_settings__rental_require_signature_validation
+#: model:ir.model.fields,field_description:rental_base_extension.field_stock_picking__rental_require_signature_validation
+msgid "Rental Require Signature Validation"
+msgstr "Requerir firma para validar alquiler"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.res_config_settings_view_form
+msgid "Require Signature to Validate Delivery"
+msgstr "Requerir firma para validar la entrega"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.res_config_settings_view_form
+msgid "When enabled, rental delivery orders can only be validated by signing. The Validate button is replaced by the Sign button."
+msgstr "Si se activa, las entregas de alquiler solo se pueden validar con firma. El botón Validar se sustituye por el botón Firmar."
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.view_picking_form
+msgid "Sign"
+msgstr "Firmar"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Salesperson"
+msgstr "Comercial"
+
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
+msgid "Status"
+msgstr "Estado"
+
+#. module: rental_base_extension
+#. odoo-javascript
+#: code:addons/rental_base_extension/static/src/xml/signature_dialog.xml:0
+#, python-format
+msgid "Confirm & Sign"
+msgstr "Confirmar y firmar"
diff --git a/rental_base_extension/models/__init__.py b/rental_base_extension/models/__init__.py
new file mode 100644
index 000000000..ba1c090c8
--- /dev/null
+++ b/rental_base_extension/models/__init__.py
@@ -0,0 +1,4 @@
+from . import res_company
+from . import res_config_settings
+from . import sale_order
+from . import stock_picking
diff --git a/rental_base_extension/models/res_company.py b/rental_base_extension/models/res_company.py
new file mode 100644
index 000000000..3318f68c6
--- /dev/null
+++ b/rental_base_extension/models/res_company.py
@@ -0,0 +1,14 @@
+# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+
+from odoo import fields, models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    rental_require_signature_validation = fields.Boolean()
+
+    rental_signature_terms = fields.Html(
+        translate=True,
+    )
diff --git a/rental_base_extension/models/res_config_settings.py b/rental_base_extension/models/res_config_settings.py
new file mode 100644
index 000000000..22ba917a6
--- /dev/null
+++ b/rental_base_extension/models/res_config_settings.py
@@ -0,0 +1,18 @@
+# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    rental_require_signature_validation = fields.Boolean(
+        related="company_id.rental_require_signature_validation",
+        readonly=False,
+    )
+
+    rental_signature_terms = fields.Html(
+        related="company_id.rental_signature_terms",
+        readonly=False,
+    )
diff --git a/rental_base_extension/models/sale_order.py b/rental_base_extension/models/sale_order.py
new file mode 100644
index 000000000..2fb3fd29c
--- /dev/null
+++ b/rental_base_extension/models/sale_order.py
@@ -0,0 +1,134 @@
+# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+
+from odoo import api, fields, models
+
+RENTAL_STATUS = [
+    ("draft", "Quotation"),
+    ("sent", "Quotation Sent"),
+    ("pickup", "Reserved"),
+    ("return", "Pickedup"),
+    ("returned", "Returned"),
+    ("cancel", "Cancelled"),
+]
+
+
+class SaleOrder(models.Model):
+    _inherit = "sale.order"
+
+    rental_ids = fields.One2many(
+        comodel_name="sale.rental",
+        inverse_name="start_order_id",
+    )
+    is_rental_order = fields.Boolean(
+        compute="_compute_is_rental_order",
+        store=True,
+    )
+    rental_status = fields.Selection(
+        selection=RENTAL_STATUS,
+        compute="_compute_rental_status",
+        store=True,
+    )
+    next_action_date = fields.Date(
+        compute="_compute_rental_status",
+        store=True,
+    )
+    is_late = fields.Boolean(
+        compute="_compute_is_late",
+    )
+    rental_duration = fields.Integer(
+        string="Duration",
+        compute="_compute_rental_duration",
+    )
+    pickup_picking_id = fields.Many2one(
+        comodel_name="stock.picking",
+        compute="_compute_rental_picking_ids",
+    )
+    return_picking_id = fields.Many2one(
+        comodel_name="stock.picking",
+        compute="_compute_rental_picking_ids",
+    )
+
+    def _get_rental_type(self):
+        return self.env.ref("rental_base.rental_sale_type", raise_if_not_found=False)
+
+    @api.depends("type_id")
+    def _compute_is_rental_order(self):
+        rental_type = self._get_rental_type()
+        for order in self:
+            order.is_rental_order = bool(rental_type and order.type_id == rental_type)
+
+    @api.depends(
+        "state",
+        "is_rental_order",
+        "rental_ids.state",
+        "default_start_date",
+        "default_end_date",
+    )
+    def _compute_rental_status(self):
+        for order in self:
+            order.next_action_date = False
+            if not order.is_rental_order:
+                order.rental_status = False
+            elif order.state in ("draft", "sent", "cancel"):
+                order.rental_status = order.state
+            elif order.state in ("sale", "done"):
+                rental_states = order.rental_ids.mapped("state")
+                if not rental_states or any(s == "ordered" for s in rental_states):
+                    order.rental_status = "pickup"
+                    order.next_action_date = order.default_start_date
+                elif any(s in ("out", "sell_progress") for s in rental_states):
+                    order.rental_status = "return"
+                    order.next_action_date = order.default_end_date
+                else:
+                    order.rental_status = "returned"
+
+    @api.depends("default_start_date", "default_end_date")
+    def _compute_rental_duration(self):
+        for order in self:
+            if order.default_start_date and order.default_end_date:
+                order.rental_duration = (
+                    order.default_end_date - order.default_start_date
+                ).days + 1
+            else:
+                order.rental_duration = 0
+
+    @api.depends(
+        "rental_ids.out_move_id.picking_id", "rental_ids.in_move_id.picking_id"
+    )
+    def _compute_rental_picking_ids(self):
+        for order in self:
+            order.pickup_picking_id = order.rental_ids.mapped("out_move_id.picking_id")[
+                :1
+            ]
+            order.return_picking_id = order.rental_ids.mapped("in_move_id.picking_id")[
+                :1
+            ]
+
+    def action_open_pickup_picking(self):
+        self.ensure_one()
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": "stock.picking",
+            "res_id": self.pickup_picking_id.id,
+            "view_mode": "form",
+            "views": [(False, "form")],
+        }
+
+    def action_open_return_picking(self):
+        self.ensure_one()
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": "stock.picking",
+            "res_id": self.return_picking_id.id,
+            "view_mode": "form",
+            "views": [(False, "form")],
+        }
+
+    @api.depends("next_action_date")
+    def _compute_is_late(self):
+        today = fields.Date.today()
+        for order in self:
+            order.is_late = bool(
+                order.next_action_date and order.next_action_date < today
+            )
diff --git a/rental_base_extension/models/stock_picking.py b/rental_base_extension/models/stock_picking.py
new file mode 100644
index 000000000..a3f750091
--- /dev/null
+++ b/rental_base_extension/models/stock_picking.py
@@ -0,0 +1,41 @@
+# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+
+from odoo import api, fields, models
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    is_rental_picking = fields.Boolean(
+        compute="_compute_is_rental_picking",
+    )
+
+    rental_require_signature_validation = fields.Boolean(
+        related="company_id.rental_require_signature_validation",
+    )
+
+    @api.depends("sale_id.type_id")
+    def _compute_is_rental_picking(self):
+        rental_type = self.env.ref(
+            "rental_base.rental_sale_type", raise_if_not_found=False
+        )
+        for picking in self:
+            picking.is_rental_picking = bool(
+                rental_type
+                and picking.sale_id
+                and picking.sale_id.type_id == rental_type
+            )
+
+    def _attach_sign(self):
+        res = super()._attach_sign()
+        if (
+            self.is_rental_picking
+            and self.company_id.rental_require_signature_validation
+            and self.state != "done"
+        ):
+            self.with_context(
+                skip_immediate=True,
+                skip_backorder=True,
+            ).button_validate()
+        return res
diff --git a/rental_base_extension/readme/DESCRIPTION.rst b/rental_base_extension/readme/DESCRIPTION.rst
index 965535953..49dfcc6ed 100644
--- a/rental_base_extension/readme/DESCRIPTION.rst
+++ b/rental_base_extension/readme/DESCRIPTION.rst
@@ -1,21 +1,41 @@
-This module extends ``rental_base`` to improve the rental order experience
-with better menu visibility and product filtering.
+This module extends ``rental_base`` to provide a complete rental order
+management experience.
+
+Dedicated rental views
+~~~~~~~~~~~~~~~~~~~~~~
+
+Replaces the default sale order views with dedicated rental-specific views:
+form, tree, kanban, calendar and search. The form view hides non-rental fields
+and adds rental period, duration and status badges. Actions set the rental sale
+type by default.
+
+Rental status tracking
+~~~~~~~~~~~~~~~~~~~~~~
+
+Adds computed ``rental_status`` on sale orders based on the state of the
+underlying ``sale.rental`` records: draft, pickup, return, returned and cancel.
+A "late" indicator warns when the next action date has passed.
 
 Rental Positions menu
 ~~~~~~~~~~~~~~~~~~~~~
 
-The ``rental_base`` module places the Rental Positions screen (the ``sale.rental``
-list) under Configuration and restricts it to debug mode. This module moves it
-to the top level of the Rentals menu as the first entry, visible to all sales
-users, since it is the primary screen for tracking rental status.
+The ``rental_base`` module places the Rental Positions screen under
+Configuration and restricts it to debug mode. This module moves it to the
+top level of the Rentals menu as the first entry, visible to all sales users.
 
 Product filter on rental order lines
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When creating a rental order, the product dropdown on order lines only shows
-rental service products (i.e. products linked to a rented physical product
-via ``rented_product_id``). This prevents users from accidentally selecting
-non-rental products on rental orders.
+When creating a rental order, the product dropdown only shows rental service
+products, preventing users from accidentally selecting non-rental products.
+
+Signature and delivery
+~~~~~~~~~~~~~~~~~~~~~~
+
+Configurable signature terms for rental delivery orders (Settings → Rental →
+Signature). When enabled, the Validate button is replaced by a Sign button
+that auto-validates on signature. The signed conditions appear on the delivery
+slip PDF.
 
 Catalan and Spanish translations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/rental_base_extension/report/report_deliveryslip.xml b/rental_base_extension/report/report_deliveryslip.xml
new file mode 100644
index 000000000..98f5c2494
--- /dev/null
+++ b/rental_base_extension/report/report_deliveryslip.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <template
+        id="report_delivery_document_rental_signature_terms"
+        inherit_id="stock.report_delivery_document"
+    >
+        <xpath expr="//div[@name='signature']" position="attributes">
+            <attribute
+                name="t-if"
+            >o.signature and not (o.is_rental_picking and o.company_id.rental_signature_terms)</attribute>
+        </xpath>
+        <xpath expr="//div[@name='signature']" position="after">
+            <div
+                t-if="o.signature and o.is_rental_picking and o.company_id.rental_signature_terms"
+                class="mt32"
+            >
+                <div class="row">
+                    <div class="col-8">
+                        <strong>Conditions</strong>
+                        <div
+                            class="small mt4"
+                            t-out="o.company_id.rental_signature_terms"
+                        />
+                    </div>
+                    <div class="col-4 text-center">
+                        <strong>Signature</strong>
+                        <div>
+                            <img
+                                t-att-src="image_data_uri(o.signature)"
+                                style="max-height: 4cm; max-width: 8cm;"
+                            />
+                        </div>
+                        <p t-field="o.partner_id.name" />
+                    </div>
+                </div>
+            </div>
+        </xpath>
+    </template>
+</odoo>
diff --git a/rental_base_extension/static/description/index.html b/rental_base_extension/static/description/index.html
index dad4f9149..fb99c2d80 100644
--- a/rental_base_extension/static/description/index.html
+++ b/rental_base_extension/static/description/index.html
@@ -375,21 +375,38 @@ <h1>Rental Base Extension</h1>
 !! source digest: sha256:09ab96bf14c0b83294c077459048e953907a79975688866d7ca219537c451e41
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/nuobit/odoo-addons/tree/16.0/rental_base_extension"><img alt="nuobit/odoo-addons" src="https://img.shields.io/badge/github-nuobit%2Fodoo--addons-lightgray.png?logo=github" /></a></p>
-<p>This module extends <tt class="docutils literal">rental_base</tt> to improve the rental order experience
-with better menu visibility and product filtering.</p>
+<p>This module extends <tt class="docutils literal">rental_base</tt> to provide a complete rental order
+management experience.</p>
+<div class="section" id="dedicated-rental-views">
+<h2>Dedicated rental views</h2>
+<p>Replaces the default sale order views with dedicated rental-specific views:
+form, tree, kanban, calendar and search. The form view hides non-rental fields
+and adds rental period, duration and status badges. Actions set the rental sale
+type by default.</p>
+</div>
+<div class="section" id="rental-status-tracking">
+<h2>Rental status tracking</h2>
+<p>Adds computed <tt class="docutils literal">rental_status</tt> on sale orders based on the state of the
+underlying <tt class="docutils literal">sale.rental</tt> records: draft, pickup, return, returned and cancel.
+A “late” indicator warns when the next action date has passed.</p>
+</div>
 <div class="section" id="rental-positions-menu">
 <h2>Rental Positions menu</h2>
-<p>The <tt class="docutils literal">rental_base</tt> module places the Rental Positions screen (the <tt class="docutils literal">sale.rental</tt>
-list) under Configuration and restricts it to debug mode. This module moves it
-to the top level of the Rentals menu as the first entry, visible to all sales
-users, since it is the primary screen for tracking rental status.</p>
+<p>The <tt class="docutils literal">rental_base</tt> module places the Rental Positions screen under
+Configuration and restricts it to debug mode. This module moves it to the
+top level of the Rentals menu as the first entry, visible to all sales users.</p>
 </div>
 <div class="section" id="product-filter-on-rental-order-lines">
 <h2>Product filter on rental order lines</h2>
-<p>When creating a rental order, the product dropdown on order lines only shows
-rental service products (i.e. products linked to a rented physical product
-via <tt class="docutils literal">rented_product_id</tt>). This prevents users from accidentally selecting
-non-rental products on rental orders.</p>
+<p>When creating a rental order, the product dropdown only shows rental service
+products, preventing users from accidentally selecting non-rental products.</p>
+</div>
+<div class="section" id="signature-and-delivery">
+<h2>Signature and delivery</h2>
+<p>Configurable signature terms for rental delivery orders (Settings → Rental →
+Signature). When enabled, the Validate button is replaced by a Sign button
+that auto-validates on signature. The signed conditions appear on the delivery
+slip PDF.</p>
 </div>
 <div class="section" id="catalan-and-spanish-translations">
 <h2>Catalan and Spanish translations</h2>
diff --git a/rental_base_extension/static/src/js/.eslintrc.yml b/rental_base_extension/static/src/js/.eslintrc.yml
new file mode 100644
index 000000000..add5a7856
--- /dev/null
+++ b/rental_base_extension/static/src/js/.eslintrc.yml
@@ -0,0 +1,2 @@
+parserOptions:
+  sourceType: module
diff --git a/rental_base_extension/static/src/js/signature_widget.js b/rental_base_extension/static/src/js/signature_widget.js
new file mode 100644
index 000000000..2b321fbe9
--- /dev/null
+++ b/rental_base_extension/static/src/js/signature_widget.js
@@ -0,0 +1,66 @@
+/** @odoo-module */
+/* Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+   License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
+
+import {SignatureDialog} from "@web/core/signature/signature_dialog";
+import {SignatureWidget} from "@web/views/widgets/signature/signature";
+import {patch} from "web.utils";
+
+patch(SignatureWidget.prototype, "rental_base_extension.SignatureWidget", {
+    async onClickSignature() {
+        const {record} = this.props;
+        const isRental =
+            record.resModel === "stock.picking" && record.data.is_rental_picking;
+        if (!isRental) {
+            return this._super(...arguments);
+        }
+        const companyId = record.data.company_id && record.data.company_id[0];
+        let rentalTerms = "";
+        if (companyId) {
+            const result = await this.orm.read(
+                "res.company",
+                [companyId],
+                ["rental_signature_terms"]
+            );
+            if (result.length && result[0].rental_signature_terms) {
+                rentalTerms = owl.markup(result[0].rental_signature_terms);
+            }
+        }
+        const nameAndSignatureProps = {
+            mode: "draw",
+            displaySignatureRatio: 3,
+            signatureType: "signature",
+            noInputName: true,
+        };
+        const {fullName} = this.props;
+        let defaultName = "";
+        if (fullName) {
+            let signName = null;
+            const fullNameData = record.data[fullName];
+            if (record.fields[fullName].type === "many2one") {
+                signName = fullNameData && fullNameData[1];
+            } else {
+                signName = fullNameData;
+            }
+            defaultName = signName === "" ? undefined : signName;
+        }
+        nameAndSignatureProps.defaultFont = this.props.defaultFont;
+        const dialogProps = {
+            defaultName,
+            nameAndSignatureProps,
+            uploadSignature: (data) => this.uploadSignature(data),
+            isRental: true,
+            rentalTerms,
+        };
+        this.dialogService.add(SignatureDialog, dialogProps);
+    },
+});
+
+patch(SignatureDialog.prototype, "rental_base_extension.SignatureDialog", {
+    setup() {
+        this._super(...arguments);
+        if (this.props.isRental) {
+            this.title = this.env._t("Delivery Signature");
+        }
+    },
+});
diff --git a/rental_base_extension/static/src/scss/rental_kanban.scss b/rental_base_extension/static/src/scss/rental_kanban.scss
new file mode 100644
index 000000000..3475c2e29
--- /dev/null
+++ b/rental_base_extension/static/src/scss/rental_kanban.scss
@@ -0,0 +1,9 @@
+// Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+// License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+// Prevent the image zoom popup from capturing mouse events.
+// Without this, hovering over a small thumbnail causes flickering:
+// mouse enters popup → leaves thumbnail → popup closes → loop.
+.o_popover:has(.o_image_zoom) {
+    pointer-events: none;
+}
diff --git a/rental_base_extension/static/src/xml/signature_dialog.xml b/rental_base_extension/static/src/xml/signature_dialog.xml
new file mode 100644
index 000000000..dcc81e89c
--- /dev/null
+++ b/rental_base_extension/static/src/xml/signature_dialog.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<templates xml:space="preserve">
+
+    <t
+        t-name="rental_base_extension.SignatureDialog"
+        t-inherit="web.SignatureDialog"
+        t-inherit-mode="extension"
+        owl="1"
+    >
+        <xpath expr="//div[hasclass('mt16')]" position="replace">
+            <div
+                t-if="props.rentalTerms"
+                class="mt16 small"
+                t-out="props.rentalTerms"
+            />
+            <div
+                t-else=""
+                class="mt16 small"
+            >By clicking Adopt &amp; Sign, I agree that the chosen signature/initials will be a valid electronic representation of my hand-written signature/initials for all purposes when it is used on documents, including legally binding contracts.</div>
+        </xpath>
+        <xpath expr="//button[hasclass('btn-primary')]" position="replace">
+            <button
+                t-if="props.isRental"
+                class="btn btn-primary"
+                t-att-disabled="signature.isSignatureEmpty"
+                t-on-click="onClickConfirm"
+            >Confirm &amp; Sign</button>
+            <button
+                t-else=""
+                class="btn btn-primary"
+                t-att-disabled="signature.isSignatureEmpty"
+                t-on-click="onClickConfirm"
+            >Adopt &amp; Sign</button>
+        </xpath>
+    </t>
+
+</templates>
diff --git a/rental_base_extension/tests/__init__.py b/rental_base_extension/tests/__init__.py
new file mode 100644
index 000000000..95d8a8bce
--- /dev/null
+++ b/rental_base_extension/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_rental_status
diff --git a/rental_base_extension/tests/test_rental_status.py b/rental_base_extension/tests/test_rental_status.py
new file mode 100644
index 000000000..18cfc709b
--- /dev/null
+++ b/rental_base_extension/tests/test_rental_status.py
@@ -0,0 +1,156 @@
+# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+
+from datetime import timedelta
+
+from odoo import fields
+from odoo.tests import common, tagged
+
+
+@tagged("post_install", "-at_install")
+class TestRentalStatus(common.TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.category_all = cls.env.ref("product.product_category_all")
+        cls.rental_sale_type = cls.env.ref("rental_base.rental_sale_type")
+        cls.uom_day = cls.env.ref("uom.product_uom_day")
+        cls.warehouse0 = cls.env.ref("stock.warehouse0")
+        cls.partner = cls.env["res.partner"].create(
+            {
+                "name": "Test Partner",
+                "email": "test@test.com",
+            }
+        )
+        cls.product_hw = cls.env["product.product"].create(
+            {
+                "name": "Rental Hardware",
+                "type": "product",
+                "categ_id": cls.category_all.id,
+            }
+        )
+        cls.service_rental = (
+            cls.env["create.rental.product"]
+            .with_context(active_model="product.product", active_id=cls.product_hw.id)
+            .create(
+                {
+                    "hw_product_id": cls.product_hw.id,
+                    "name": "Rental of Rental Hardware (Day)",
+                    "categ_id": cls.product_hw.categ_id.id,
+                    "copy_image": True,
+                }
+            )
+            .create_rental_product()
+        )
+        cls.service_rental = cls.env["product.product"].browse(
+            cls.service_rental["res_id"]
+        )
+        cls.service_rental.write(
+            {
+                "uom_id": cls.uom_day.id,
+                "uom_po_id": cls.uom_day.id,
+                "list_price": 100,
+            }
+        )
+        cls.service_rental.rental = True
+
+    def _create_rental_order(self, **kwargs):
+        today = fields.Date.today()
+        date_start = kwargs.get("date_start", today + timedelta(days=1))
+        date_end = kwargs.get("date_end", today + timedelta(days=5))
+        date_qty = (date_end - date_start).days + 1
+        return self.env["sale.order"].create(
+            {
+                "type_id": self.rental_sale_type.id,
+                "partner_id": self.partner.id,
+                "partner_invoice_id": self.partner.id,
+                "partner_shipping_id": self.partner.id,
+                "pricelist_id": self.env.ref("product.list0").id,
+                "picking_policy": "direct",
+                "warehouse_id": self.warehouse0.id,
+                "order_line": [
+                    (
+                        0,
+                        0,
+                        {
+                            "name": "Rental Service",
+                            "product_id": self.service_rental.id,
+                            "rental": True,
+                            "rental_type": "new_rental",
+                            "rental_qty": 1,
+                            "product_uom_qty": date_qty,
+                            "start_date": date_start,
+                            "end_date": date_end,
+                            "price_unit": 100,
+                            "product_uom": self.uom_day.id,
+                        },
+                    )
+                ],
+            }
+        )
+
+    def _create_and_confirm_rental_order(self):
+        order = self._create_rental_order()
+        order.action_confirm()
+        return order
+
+    def test_confirmed_rental_status_pickup(self):
+        """Confirmed rental with sale.rental records should have 'pickup' status."""
+        order = self._create_and_confirm_rental_order()
+        self.assertTrue(order.rental_ids)
+        self.assertEqual(order.rental_status, "pickup")
+
+    def test_confirmed_rental_status_pickup_product_without_rental_flag(self):
+        """Confirmed rental with product missing rental=True on template
+        should still be recognized as a rental order."""
+        self.service_rental.rental = False
+        order = self._create_and_confirm_rental_order()
+        self.assertTrue(order.is_rental_order)
+        self.assertTrue(order.rental_ids)
+        self.assertEqual(order.rental_status, "pickup")
+
+    def test_confirmed_rental_status_pickup_without_rental_records(self):
+        """Confirmed rental order without sale.rental records should be 'pickup',
+        not 'returned'. This happens when a product is not a proper rental
+        service (missing rented_product_id) but the order is created from
+        the rental menu."""
+        order = self._create_and_confirm_rental_order()
+        order.rental_ids.unlink()
+        order._compute_rental_status()
+        self.assertFalse(order.rental_ids)
+        self.assertEqual(order.rental_status, "pickup")
+
+    def test_rental_status_draft(self):
+        """Draft rental order should have 'draft' status."""
+        order = self._create_rental_order()
+        self.assertEqual(order.rental_status, "draft")
+
+    def test_rental_status_cancel(self):
+        """Cancelled rental order should have 'cancel' status."""
+        order = self._create_and_confirm_rental_order()
+        order._action_cancel()
+        self.assertEqual(order.rental_status, "cancel")
+
+    def test_rental_status_return(self):
+        """Rental with completed outgoing picking should have 'return' status."""
+        order = self._create_and_confirm_rental_order()
+        rental = order.rental_ids
+        out_picking = rental.out_move_id.picking_id
+        out_picking.action_assign()
+        out_picking.move_ids.quantity_done = out_picking.move_ids.product_uom_qty
+        out_picking.button_validate()
+        self.assertEqual(order.rental_status, "return")
+
+    def test_rental_status_returned(self):
+        """Rental with both pickings completed should have 'returned' status."""
+        order = self._create_and_confirm_rental_order()
+        rental = order.rental_ids
+        out_picking = rental.out_move_id.picking_id
+        out_picking.action_assign()
+        out_picking.move_ids.quantity_done = out_picking.move_ids.product_uom_qty
+        out_picking.button_validate()
+        in_picking = rental.in_move_id.picking_id
+        in_picking.action_assign()
+        in_picking.move_ids.quantity_done = in_picking.move_ids.product_uom_qty
+        in_picking.button_validate()
+        self.assertEqual(order.rental_status, "returned")
diff --git a/rental_base_extension/views/res_config_settings_views.xml b/rental_base_extension/views/res_config_settings_views.xml
new file mode 100644
index 000000000..bb24857e9
--- /dev/null
+++ b/rental_base_extension/views/res_config_settings_views.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field
+            name="name"
+        >res.config.settings.view.form.inherit.rental_base_extension</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="rental_base.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <div class="app_settings_block" data-key="rental_base" position="inside">
+                <h2>Signature</h2>
+                <div class="row mt16 o_settings_container">
+                    <div class="col-12 o_setting_box">
+                        <div class="o_setting_left_pane">
+                            <field name="rental_require_signature_validation" />
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label
+                                for="rental_require_signature_validation"
+                                string="Require Signature to Validate Delivery"
+                            />
+                            <span
+                                class="fa fa-lg fa-building-o"
+                                title="Values set here are company-specific."
+                                groups="base.group_multi_company"
+                                role="img"
+                            />
+                            <div
+                                class="text-muted"
+                            >When enabled, rental delivery orders can only be validated by signing. The Validate button is replaced by the Sign button.</div>
+                        </div>
+                    </div>
+                    <div class="col-12 o_setting_box">
+                        <div class="o_setting_right_pane">
+                            <label for="rental_signature_terms" />
+                            <span
+                                class="fa fa-lg fa-building-o"
+                                title="Values set here are company-specific."
+                                groups="base.group_multi_company"
+                                role="img"
+                            />
+                            <div
+                                class="text-muted"
+                            >Terms shown in the signature dialog when signing a rental delivery order. Leave empty to use the default text.</div>
+                            <div class="content-group mt16">
+                                <field name="rental_signature_terms" widget="html" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </field>
+    </record>
+</odoo>
diff --git a/rental_base_extension/views/sale_order_views.xml b/rental_base_extension/views/sale_order_views.xml
new file mode 100644
index 000000000..6655fdc29
--- /dev/null
+++ b/rental_base_extension/views/sale_order_views.xml
@@ -0,0 +1,661 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <!-- ============================================================ -->
+    <!-- Deactivate rental_base views that modify the standard form   -->
+    <!-- ============================================================ -->
+    <record id="rental_base.sale_rental" model="ir.ui.view">
+        <field name="active" eval="False" />
+    </record>
+    <record id="rental_base.sale_start_end_dates" model="ir.ui.view">
+        <field name="active" eval="False" />
+    </record>
+    <record id="rental_base.sale_stock" model="ir.ui.view">
+        <field name="active" eval="False" />
+    </record>
+    <record id="rental_base.sale_order_type" model="ir.ui.view">
+        <field name="active" eval="False" />
+    </record>
+    <record id="rental_base.view_order_form" model="ir.ui.view">
+        <field name="active" eval="False" />
+    </record>
+
+    <!-- ============================================================ -->
+    <!-- Dedicated Rental Form View (mode=primary)                    -->
+    <!-- ============================================================ -->
+    <record id="sale_order_view_form_rental" model="ir.ui.view">
+        <field name="name">sale.order.view.form.rental</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="mode">primary</field>
+        <field name="priority">999</field>
+        <field name="arch" type="xml">
+            <!-- Hidden helper fields -->
+            <xpath expr="//field[@name='partner_id']" position="before">
+                <field name="is_rental_order" invisible="1" />
+                <field name="rental_status" invisible="1" />
+                <field name="is_late" invisible="1" />
+                <field name="pickup_picking_id" invisible="1" />
+                <field name="return_picking_id" invisible="1" />
+            </xpath>
+
+            <!-- Hide type_id (always rental in this view) -->
+            <xpath expr="//field[@name='type_id']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+
+            <!-- Pickup / Return / Update Times buttons -->
+            <xpath expr="//button[@name='action_confirm']" position="after">
+                <button
+                    name="action_open_pickup_picking"
+                    string="Pickup"
+                    type="object"
+                    class="btn-primary"
+                    icon="fa-truck"
+                    attrs="{'invisible': ['|', ('rental_status', '!=', 'pickup'), ('pickup_picking_id', '=', False)]}"
+                />
+                <button
+                    name="action_open_return_picking"
+                    string="Return"
+                    type="object"
+                    class="btn-primary"
+                    icon="fa-undo"
+                    attrs="{'invisible': ['|', ('rental_status', '!=', 'return'), ('return_picking_id', '=', False)]}"
+                />
+                <button
+                    name="%(rental_base.action_update_sale_line_date)d"
+                    string="Update Times"
+                    type="action"
+                    attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}"
+                />
+            </xpath>
+
+            <!-- Rental status badge at top-right (pure state, no late mix) -->
+            <xpath expr="//div[@name='button_box']" position="after">
+                <div
+                    class="badge rounded-pill text-bg-info float-end fs-6 border-0"
+                    attrs="{'invisible': ['|', ('is_rental_order', '=', False), ('rental_status', '!=', 'pickup')]}"
+                >Reserved</div>
+                <div
+                    class="badge rounded-pill text-bg-warning float-end fs-6 border-0"
+                    attrs="{'invisible': ['|', ('is_rental_order', '=', False), ('rental_status', '!=', 'return')]}"
+                >Picked-up</div>
+                <div
+                    class="badge rounded-pill text-bg-success float-end fs-6 border-0"
+                    attrs="{'invisible': ['|', ('is_rental_order', '=', False), ('rental_status', '!=', 'returned')]}"
+                >Returned</div>
+                <!-- Late indicator (separate from state) -->
+                <div
+                    class="badge rounded-pill text-bg-danger float-end fs-6 border-0"
+                    attrs="{'invisible': ['|', ('is_rental_order', '=', False), ('is_late', '=', False)]}"
+                >Late</div>
+            </xpath>
+
+            <!-- Rental period and duration -->
+            <xpath expr="//field[@name='validity_date']" position="after">
+                <label for="default_start_date" string="Rental Period" />
+                <div class="o_row">
+                    <field
+                        name="default_start_date"
+                        widget="daterange"
+                        nolabel="1"
+                        options="{'related_end_date': 'default_end_date'}"
+                    />
+                    <i
+                        class="fa fa-long-arrow-right mx-1"
+                        aria-label="Arrow icon"
+                        title="Arrow"
+                    />
+                    <field
+                        name="default_end_date"
+                        widget="daterange"
+                        nolabel="1"
+                        options="{'related_start_date': 'default_start_date'}"
+                    />
+                </div>
+                <field name="rental_duration" string="Duration" />
+            </xpath>
+
+            <!-- Filter product_id to only show rental products -->
+            <xpath
+                expr="//field[@name='order_line']//form//field[@name='product_id']"
+                position="attributes"
+            >
+                <attribute name="domain">
+                    [('sale_ok', '=', True),
+                     ('rented_product_id', '!=', False),
+                     '|', ('company_id', '=', False),
+                          ('company_id', '=', parent.company_id)]
+                </attribute>
+            </xpath>
+            <xpath
+                expr="//field[@name='order_line']//tree//field[@name='product_id']"
+                position="attributes"
+            >
+                <attribute name="domain">
+                    [('sale_ok', '=', True),
+                     ('rented_product_id', '!=', False),
+                     '|', ('company_id', '=', False),
+                          ('company_id', '=', parent.company_id)]
+                </attribute>
+            </xpath>
+            <!-- Also filter product_template_id (used by sol_product_many2one widget) -->
+            <xpath
+                expr="//field[@name='order_line']//tree//field[@name='product_template_id']"
+                position="attributes"
+            >
+                <attribute name="domain">
+                    [('sale_ok', '=', True),
+                     ('rented_product_tmpl_id', '!=', False),
+                     '|', ('company_id', '=', False),
+                          ('company_id', '=', parent.company_id)]
+                </attribute>
+            </xpath>
+
+            <!-- Add invisible rental fields to tree for onchange support -->
+            <xpath
+                expr="//field[@name='order_line']//tree//field[@name='product_id']"
+                position="after"
+            >
+                <field name="rental" invisible="1" />
+                <field name="can_sell_rental" invisible="1" />
+                <field name="rental_type" invisible="1" />
+            </xpath>
+
+            <!-- Replace product_uom_qty with rental_qty in the same position -->
+            <xpath
+                expr="//field[@name='order_line']//tree//field[@name='product_uom_qty']"
+                position="before"
+            >
+                <field name="rental_qty" string="Qty" />
+            </xpath>
+            <xpath
+                expr="//field[@name='order_line']//tree//field[@name='product_uom_qty']"
+                position="attributes"
+            >
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath
+                expr="//field[@name='order_line']//label[@for='product_uom_qty']"
+                position="attributes"
+            >
+                <attribute name="invisible">1</attribute>
+            </xpath>
+
+            <!-- Make order lines editable inline (no popup) -->
+            <xpath expr="//field[@name='order_line']" position="attributes">
+                <attribute name="mode">tree</attribute>
+            </xpath>
+            <xpath expr="//field[@name='order_line']//tree" position="attributes">
+                <attribute name="editable">bottom</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- ============================================================ -->
+    <!-- Dedicated Rental Tree View                                   -->
+    <!-- ============================================================ -->
+    <record id="sale_order_view_tree_rental" model="ir.ui.view">
+        <field name="name">sale.order.view.tree.rental</field>
+        <field name="model">sale.order</field>
+        <field name="arch" type="xml">
+            <tree decoration-muted="rental_status == 'cancel'">
+                <field name="is_rental_order" invisible="1" />
+                <field name="is_late" invisible="1" />
+                <field name="invoice_status" invisible="1" />
+                <field name="name" readonly="1" decoration-bf="1" />
+                <field name="partner_id" readonly="1" />
+                <field
+                    name="amount_total"
+                    sum="Total"
+                    widget="monetary"
+                    decoration-bf="1"
+                    decoration-info="invoice_status == 'to invoice'"
+                />
+                <field
+                    name="rental_status"
+                    widget="badge"
+                    decoration-muted="rental_status in ('draft', 'sent')"
+                    decoration-info="rental_status == 'pickup'"
+                    decoration-warning="rental_status == 'return'"
+                    decoration-success="rental_status == 'returned'"
+                    decoration-danger="rental_status == 'cancel'"
+                />
+                <field name="state" invisible="1" />
+                <field name="currency_id" invisible="1" />
+            </tree>
+        </field>
+    </record>
+
+    <!-- ============================================================ -->
+    <!-- Dedicated Rental Kanban View                                 -->
+    <!-- ============================================================ -->
+    <record id="sale_order_view_kanban_rental" model="ir.ui.view">
+        <field name="name">sale.order.view.kanban.rental</field>
+        <field name="model">sale.order</field>
+        <field name="arch" type="xml">
+            <kanban quick_create="false" class="o_kanban_mobile align-content-start">
+                <field name="name" />
+                <field name="partner_id" />
+                <field name="next_action_date" />
+                <field name="rental_status" />
+                <field name="is_late" />
+                <field name="is_rental_order" />
+                <field name="amount_total" />
+                <field name="currency_id" />
+                <field name="state" />
+                <templates>
+                    <t t-name="kanban-box">
+                        <div class="oe_kanban_card oe_kanban_global_click h-100">
+                            <div class="oe_kanban_content d-flex flex-column h-100">
+                                <!-- Top: Partner name + Amount -->
+                                <div class="o_kanban_record_top mb-0">
+                                    <div class="o_kanban_record_headings">
+                                        <strong class="o_kanban_record_title">
+                                            <field name="partner_id" />
+                                        </strong>
+                                    </div>
+                                    <strong>
+                                        <field name="amount_total" widget="monetary" />
+                                    </strong>
+                                </div>
+                                <!-- Middle: Order number + next action -->
+                                <div class="o_kanban_record_body flex-grow-1">
+                                    <span class="text-muted">
+                                        <t t-out="record.name.value" />
+                                    </span>
+                                    <br />
+                                    <t t-if="record.next_action_date.value">
+                                        <span
+                                            t-attf-class="#{record.is_late.raw_value ? 'text-danger' : 'text-muted'}"
+                                        >
+                                            <t t-if="record.is_late.raw_value">
+                                                <i
+                                                    class="fa fa-warning me-1"
+                                                    title="Late"
+                                                />
+                                            </t>
+                                            <t
+                                                t-if="record.rental_status.raw_value == 'pickup'"
+                                            >Pickup: </t>
+                                            <t
+                                                t-if="record.rental_status.raw_value == 'return'"
+                                            >Return: </t>
+                                            <t t-out="record.next_action_date.value" />
+                                        </span>
+                                    </t>
+                                </div>
+                                <!-- Bottom: Status badge + Customer photo -->
+                                <div class="o_kanban_record_bottom">
+                                    <div
+                                        class="oe_kanban_bottom_left"
+                                        style="font-size: 1.5rem;"
+                                    >
+                                        <field
+                                            name="rental_status"
+                                            widget="label_selection"
+                                            options="{'classes': {
+                                                'draft': 'light',
+                                                'sent': 'light',
+                                                'pickup': 'info',
+                                                'return': 'warning',
+                                                'returned': 'success',
+                                                'cancel': 'danger'
+                                            }}"
+                                        />
+                                    </div>
+                                    <div class="oe_kanban_bottom_right">
+                                        <div
+                                            data-tooltip-template="web.ImageZoomTooltip"
+                                            t-att-data-tooltip-info="JSON.stringify({url: '/web/image/res.partner/' + record.partner_id.raw_value + '/image_1024'})"
+                                            data-tooltip-position="top"
+                                            data-tooltip-delay="300"
+                                        >
+                                            <img
+                                                t-att-src="kanban_image('res.partner', 'avatar_128', record.partner_id.raw_value)"
+                                                t-att-title="record.partner_id.value"
+                                                t-att-alt="record.partner_id.value"
+                                                class="rounded-circle"
+                                                style="width: 28px; height: 28px; object-fit: cover;"
+                                            />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <!-- ============================================================ -->
+    <!-- Dedicated Rental Calendar View                               -->
+    <!-- ============================================================ -->
+    <record id="sale_order_view_calendar_rental" model="ir.ui.view">
+        <field name="name">sale.order.view.calendar.rental</field>
+        <field name="model">sale.order</field>
+        <field name="arch" type="xml">
+            <calendar
+                string="Rental Orders"
+                date_start="default_start_date"
+                date_stop="default_end_date"
+                color="rental_status"
+                mode="month"
+                quick_add="false"
+            >
+                <field name="partner_id" />
+                <field name="name" />
+                <field name="rental_status" />
+                <field name="amount_total" widget="monetary" />
+            </calendar>
+        </field>
+    </record>
+
+    <!-- ============================================================ -->
+    <!-- Dedicated Rental Search View                                 -->
+    <!-- ============================================================ -->
+    <record id="sale_order_view_search_rental" model="ir.ui.view">
+        <field name="name">sale.order.view.search.rental</field>
+        <field name="model">sale.order</field>
+        <field name="priority">100</field>
+        <field name="arch" type="xml">
+            <search string="Search Rental Orders">
+                <field
+                    name="name"
+                    string="Order"
+                    filter_domain="['|', '|', ('name', 'ilike', self), ('client_order_ref', 'ilike', self), ('partner_id', 'child_of', self)]"
+                />
+                <field name="partner_id" operator="child_of" />
+                <field name="user_id" />
+                <field
+                    name="order_line"
+                    string="Product"
+                    filter_domain="[('order_line.product_id', 'ilike', self)]"
+                />
+                <filter
+                    string="My Orders"
+                    domain="[('user_id', '=', uid)]"
+                    name="my_rental_orders"
+                />
+                <separator />
+                <filter
+                    name="from_rental"
+                    string="Rentals"
+                    domain="[('is_rental_order', '=', True)]"
+                />
+                <separator />
+                <filter
+                    name="filter_today"
+                    string="To Do Today"
+                    domain="[('next_action_date', '=', context_today().strftime('%Y-%m-%d'))]"
+                />
+                <separator />
+                <filter
+                    name="filter_to_pickup"
+                    string="To Pickup"
+                    domain="[('rental_status', '=', 'pickup')]"
+                />
+                <filter
+                    name="filter_to_return"
+                    string="To Return"
+                    domain="[('rental_status', '=', 'return')]"
+                />
+                <separator />
+                <filter
+                    name="filter_late"
+                    string="Late"
+                    domain="[('rental_status', 'in', ['pickup', 'return']), ('next_action_date', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                />
+                <separator />
+                <filter
+                    string="Pickup Date"
+                    name="filter_pickup"
+                    date="default_start_date"
+                />
+                <filter
+                    string="Return Date"
+                    name="filter_return"
+                    date="default_end_date"
+                />
+                <separator />
+                <group expand="0" string="Group By">
+                    <filter
+                        string="Status"
+                        name="groupby_status"
+                        context="{'group_by': 'rental_status'}"
+                    />
+                    <separator />
+                    <filter
+                        string="Salesperson"
+                        name="salesperson"
+                        domain="[]"
+                        context="{'group_by': 'user_id'}"
+                    />
+                    <filter
+                        string="Customer"
+                        name="customer"
+                        domain="[]"
+                        context="{'group_by': 'partner_id'}"
+                    />
+                </group>
+                <searchpanel>
+                    <field name="rental_status" icon="fa-retweet" enable_counters="1" />
+                    <field
+                        name="invoice_status"
+                        icon="fa-retweet"
+                        enable_counters="1"
+                    />
+                </searchpanel>
+            </search>
+        </field>
+    </record>
+
+    <!-- ============================================================ -->
+    <!-- Actions                                                      -->
+    <!-- ============================================================ -->
+    <record id="sale_order_action_rental" model="ir.actions.act_window">
+        <field name="name">Rental Orders</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="search_view_id" ref="sale_order_view_search_rental" />
+        <field
+            name="context"
+            eval="{
+                'in_rental_app': 1,
+                'search_default_from_rental': 1,
+                'default_type_id': ref('rental_base.rental_sale_type'),
+            }"
+        />
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new rental order!
+            </p>
+        </field>
+    </record>
+    <record
+        id="sale_order_action_rental_view_kanban"
+        model="ir.actions.act_window.view"
+    >
+        <field name="sequence">1</field>
+        <field name="view_mode">kanban</field>
+        <field name="view_id" ref="sale_order_view_kanban_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental" />
+    </record>
+    <record id="sale_order_action_rental_view_tree" model="ir.actions.act_window.view">
+        <field name="sequence">2</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="sale_order_view_tree_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental" />
+    </record>
+    <record id="sale_order_action_rental_view_form" model="ir.actions.act_window.view">
+        <field name="sequence">3</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="sale_order_view_form_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental" />
+    </record>
+    <record
+        id="sale_order_action_rental_view_calendar"
+        model="ir.actions.act_window.view"
+    >
+        <field name="sequence">4</field>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="sale_order_view_calendar_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental" />
+    </record>
+
+    <!-- Today: Pickups -->
+    <record id="sale_order_action_rental_today_pickup" model="ir.actions.act_window">
+        <field name="name">Pickups Today</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="domain">[('is_rental_order', '=', True)]</field>
+        <field name="search_view_id" ref="sale_order_view_search_rental" />
+        <field
+            name="context"
+            eval="{
+                'in_rental_app': 1,
+                'search_default_filter_today': 1,
+                'search_default_filter_to_pickup': 1,
+                'default_type_id': ref('rental_base.rental_sale_type'),
+            }"
+        />
+    </record>
+    <record
+        id="sale_order_action_rental_today_pickup_view_tree"
+        model="ir.actions.act_window.view"
+    >
+        <field name="sequence">1</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="sale_order_view_tree_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental_today_pickup" />
+    </record>
+    <record
+        id="sale_order_action_rental_today_pickup_view_kanban"
+        model="ir.actions.act_window.view"
+    >
+        <field name="sequence">2</field>
+        <field name="view_mode">kanban</field>
+        <field name="view_id" ref="sale_order_view_kanban_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental_today_pickup" />
+    </record>
+    <record
+        id="sale_order_action_rental_today_pickup_view_form"
+        model="ir.actions.act_window.view"
+    >
+        <field name="sequence">3</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="sale_order_view_form_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental_today_pickup" />
+    </record>
+
+    <!-- Today: Returns -->
+    <record id="sale_order_action_rental_today_return" model="ir.actions.act_window">
+        <field name="name">Returns Today</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="domain">[('is_rental_order', '=', True)]</field>
+        <field name="search_view_id" ref="sale_order_view_search_rental" />
+        <field
+            name="context"
+            eval="{
+                'in_rental_app': 1,
+                'search_default_filter_today': 1,
+                'search_default_filter_to_return': 1,
+                'default_type_id': ref('rental_base.rental_sale_type'),
+            }"
+        />
+    </record>
+    <record
+        id="sale_order_action_rental_today_return_view_tree"
+        model="ir.actions.act_window.view"
+    >
+        <field name="sequence">1</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="sale_order_view_tree_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental_today_return" />
+    </record>
+    <record
+        id="sale_order_action_rental_today_return_view_kanban"
+        model="ir.actions.act_window.view"
+    >
+        <field name="sequence">2</field>
+        <field name="view_mode">kanban</field>
+        <field name="view_id" ref="sale_order_view_kanban_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental_today_return" />
+    </record>
+    <record
+        id="sale_order_action_rental_today_return_view_form"
+        model="ir.actions.act_window.view"
+    >
+        <field name="sequence">3</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="sale_order_view_form_rental" />
+        <field name="act_window_id" ref="sale_order_action_rental_today_return" />
+    </record>
+
+    <!-- ============================================================ -->
+    <!-- Menus (Enterprise-style structure)                           -->
+    <!-- ============================================================ -->
+
+    <!-- Orders submenu group -->
+    <menuitem
+        id="sale_order_menu_rental"
+        name="Orders"
+        parent="rental_base.menu_rental_root"
+        sequence="2"
+    />
+
+    <!-- Orders > Orders -->
+    <menuitem
+        id="sale_order_menu_rental_orders"
+        name="Orders"
+        parent="sale_order_menu_rental"
+        action="sale_order_action_rental"
+        sequence="1"
+    />
+
+    <!-- Hide rental_base's separate Quotations/Orders menus (redundant,
+         our single "Orders" view with rental_status covers both) -->
+    <record id="rental_base.menu_rental_quotations" model="ir.ui.menu">
+        <field name="active" eval="False" />
+    </record>
+    <record id="rental_base.menu_rental_orders" model="ir.ui.menu">
+        <field name="active" eval="False" />
+    </record>
+
+    <!-- Hide sale_rental's menu item from the Sale app
+         (rental positions are accessed from the Rentals app) -->
+    <record id="sale_rental.sale_rental_menu" model="ir.ui.menu">
+        <field name="active" eval="False" />
+    </record>
+
+    <!-- Orders > To Do Today -->
+    <menuitem
+        id="sale_order_menu_rental_today"
+        name="To Do Today"
+        parent="sale_order_menu_rental"
+        sequence="3"
+    />
+
+    <!-- Orders > To Do Today > Pickup -->
+    <menuitem
+        id="sale_order_menu_rental_today_pickup"
+        name="Pickup"
+        parent="sale_order_menu_rental_today"
+        action="sale_order_action_rental_today_pickup"
+        sequence="1"
+    />
+
+    <!-- Orders > To Do Today > Return -->
+    <menuitem
+        id="sale_order_menu_rental_today_return"
+        name="Return"
+        parent="sale_order_menu_rental_today"
+        action="sale_order_action_rental_today_return"
+        sequence="2"
+    />
+
+</odoo>
diff --git a/rental_base_extension/views/stock_picking_views.xml b/rental_base_extension/views/stock_picking_views.xml
new file mode 100644
index 000000000..9370dad8b
--- /dev/null
+++ b/rental_base_extension/views/stock_picking_views.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="view_picking_form" model="ir.ui.view">
+        <field name="name">stock.picking.form.inherit.rental_base_extension</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form" />
+        <field name="arch" type="xml">
+            <field name="origin" position="after">
+                <field name="is_rental_picking" invisible="1" />
+                <field name="is_signed" invisible="1" />
+                <field name="rental_require_signature_validation" invisible="1" />
+            </field>
+            <!-- Hide Validate (highlighted) when rental outgoing + require signature -->
+            <xpath
+                expr="//button[@name='button_validate'][hasclass('oe_highlight')]"
+                position="attributes"
+            >
+                <attribute name="attrs">{
+                    'invisible': [
+                        '|', '|',
+                        ('state', 'in', ('waiting', 'confirmed')),
+                        ('show_validate', '=', False),
+                        '&amp;', '&amp;',
+                        ('is_rental_picking', '=', True),
+                        ('rental_require_signature_validation', '=', True),
+                        ('picking_type_code', '=', 'outgoing'),
+                    ],
+                }</attribute>
+            </xpath>
+            <!-- Hide Validate (non-highlighted) when rental outgoing + require signature -->
+            <xpath
+                expr="//button[@name='button_validate'][hasclass('o_btn_validate')]"
+                position="attributes"
+            >
+                <attribute name="attrs">{
+                    'invisible': [
+                        '|', '|',
+                        ('state', 'not in', ('waiting', 'confirmed')),
+                        ('show_validate', '=', False),
+                        '&amp;', '&amp;',
+                        ('is_rental_picking', '=', True),
+                        ('rental_require_signature_validation', '=', True),
+                        ('picking_type_code', '=', 'outgoing'),
+                    ],
+                }</attribute>
+            </xpath>
+            <!-- Hide Sign (highlighted, state=done) when rental + require signature + already signed -->
+            <xpath expr="//widget[@name='signature'][@highlight]" position="attributes">
+                <attribute name="attrs">{
+                    'invisible': [
+                        '|', '|', '|',
+                        ('id', '=', False),
+                        ('picking_type_code', '!=', 'outgoing'),
+                        ('state', '!=', 'done'),
+                        '&amp;', '&amp;',
+                        ('is_rental_picking', '=', True),
+                        ('rental_require_signature_validation', '=', True),
+                        ('is_signed', '=', True),
+                    ],
+                }</attribute>
+            </xpath>
+            <!-- Hide Sign (non-highlighted, state!=done) when rental + require signature -->
+            <xpath
+                expr="//widget[@name='signature'][not(@highlight)]"
+                position="attributes"
+            >
+                <attribute name="attrs">{
+                    'invisible': [
+                        '|', '|', '|',
+                        ('id', '=', False),
+                        ('picking_type_code', '!=', 'outgoing'),
+                        ('state', '=', 'done'),
+                        '&amp;',
+                        ('is_rental_picking', '=', True),
+                        ('rental_require_signature_validation', '=', True),
+                    ],
+                }</attribute>
+            </xpath>
+            <!-- Add new highlighted Sign widget for rental auto-validate
+                 (placed before Validate so it takes its position when Validate is hidden) -->
+            <xpath
+                expr="//button[@name='button_validate'][hasclass('oe_highlight')]"
+                position="before"
+            >
+                <widget
+                    name="signature"
+                    string="Sign"
+                    highlight="1"
+                    attrs="{
+                        'invisible': [
+                            '|', '|', '|', '|', '|',
+                            ('id', '=', False),
+                            ('picking_type_code', '!=', 'outgoing'),
+                            ('state', '=', 'done'),
+                            ('is_rental_picking', '=', False),
+                            ('rental_require_signature_validation', '=', False),
+                            ('show_validate', '=', False),
+                        ],
+                    }"
+                    full_name="partner_id"
+                    groups="stock.group_stock_sign_delivery"
+                />
+            </xpath>
+        </field>
+    </record>
+</odoo>

From 832a75315c4dbe4198b43ca473faa67ffbc867d7 Mon Sep 17 00:00:00 2001
From: Eric Antones <eantones@nuobit.com>
Date: Mon, 23 Mar 2026 23:50:03 +0100
Subject: [PATCH 2/2] [REF] sale_rental_extension: remove rental_base-dependent
 code

Code that referenced rental_base (views, menus, actions, SaleOrder model,
StockPicking model, config settings, signature widget, delivery report
and tests) has been moved to rental_base_extension where it belongs.

This module now only extends sale_rental with:
- SaleOrderLine: rental_qty defaults, inline editing, qty sync
- sale.rental: kanban, calendar views and search enhancements
---
 sale_rental_extension/README.rst              |   5 +-
 sale_rental_extension/__manifest__.py         |  17 +-
 sale_rental_extension/i18n/ca.po              | 278 --------
 sale_rental_extension/i18n/es.po              | 278 --------
 sale_rental_extension/models/__init__.py      |   5 +-
 sale_rental_extension/models/res_company.py   |  14 -
 .../models/res_config_settings.py             |  18 -
 sale_rental_extension/models/sale_order.py    | 217 ------
 .../models/sale_order_line.py                 |  87 +++
 sale_rental_extension/models/stock_picking.py |  41 --
 sale_rental_extension/readme/DESCRIPTION.rst  |   5 +-
 .../report/report_deliveryslip.xml            |  41 --
 .../static/description/index.html             |   5 +-
 .../static/src/js/.eslintrc.yml               |   2 -
 .../static/src/js/signature_widget.js         |  66 --
 .../static/src/scss/sale_rental_kanban.scss   |   9 -
 .../static/src/xml/signature_dialog.xml       |  39 --
 sale_rental_extension/tests/__init__.py       |   1 -
 .../tests/test_rental_status.py               | 156 -----
 .../views/res_config_settings_views.xml       |  56 --
 .../views/sale_order_rental_views.xml         | 655 ------------------
 .../views/stock_picking_views.xml             | 108 ---
 22 files changed, 97 insertions(+), 2006 deletions(-)
 delete mode 100644 sale_rental_extension/models/res_company.py
 delete mode 100644 sale_rental_extension/models/res_config_settings.py
 delete mode 100644 sale_rental_extension/models/sale_order.py
 create mode 100644 sale_rental_extension/models/sale_order_line.py
 delete mode 100644 sale_rental_extension/models/stock_picking.py
 delete mode 100644 sale_rental_extension/report/report_deliveryslip.xml
 delete mode 100644 sale_rental_extension/static/src/js/.eslintrc.yml
 delete mode 100644 sale_rental_extension/static/src/js/signature_widget.js
 delete mode 100644 sale_rental_extension/static/src/scss/sale_rental_kanban.scss
 delete mode 100644 sale_rental_extension/static/src/xml/signature_dialog.xml
 delete mode 100644 sale_rental_extension/tests/__init__.py
 delete mode 100644 sale_rental_extension/tests/test_rental_status.py
 delete mode 100644 sale_rental_extension/views/res_config_settings_views.xml
 delete mode 100644 sale_rental_extension/views/sale_order_rental_views.xml
 delete mode 100644 sale_rental_extension/views/stock_picking_views.xml

diff --git a/sale_rental_extension/README.rst b/sale_rental_extension/README.rst
index 09e607c1e..b444745e0 100644
--- a/sale_rental_extension/README.rst
+++ b/sale_rental_extension/README.rst
@@ -30,9 +30,8 @@ This module extends ``sale_rental`` to improve the rental positions experience:
 
 * Kanban and calendar views for the Rental Positions screen
 * Searchpanel with state filter and "Today" filter
-* Configurable signature terms for rental delivery orders
-  (Settings → Rental → Signature)
-* Custom signature dialog with "Confirm & Sign" button on rental pickings
+* Rental quantity defaults to 1 when adding a rental product
+* Rental quantity can be edited on confirmed orders (before pickup)
 * Catalan and Spanish translations
 
 .. IMPORTANT::
diff --git a/sale_rental_extension/__manifest__.py b/sale_rental_extension/__manifest__.py
index 39784cb9b..9d0c28b63 100644
--- a/sale_rental_extension/__manifest__.py
+++ b/sale_rental_extension/__manifest__.py
@@ -3,9 +3,9 @@
 
 {
     "name": "Sale Rental Extension",
-    "summary": "Dedicated rental views, rental status tracking,"
-    " kanban, calendar, configurable signature terms and translations.",
-    "version": "16.0.1.4.0",
+    "summary": "Rental position kanban, calendar views,"
+    " rental quantity defaults and inline editing improvements.",
+    "version": "16.0.1.5.0",
     "development_status": "Alpha",
     "category": "Rental",
     "author": "NuoBiT Solutions SL",
@@ -15,17 +15,6 @@
         "sale_rental",
     ],
     "data": [
-        "report/report_deliveryslip.xml",
-        "views/sale_order_rental_views.xml",
-        "views/res_config_settings_views.xml",
         "views/sale_rental_views.xml",
-        "views/stock_picking_views.xml",
     ],
-    "assets": {
-        "web.assets_backend": [
-            "sale_rental_extension/static/src/js/signature_widget.js",
-            "sale_rental_extension/static/src/scss/sale_rental_kanban.scss",
-            "sale_rental_extension/static/src/xml/signature_dialog.xml",
-        ],
-    },
 }
diff --git a/sale_rental_extension/i18n/ca.po b/sale_rental_extension/i18n/ca.po
index ce0ef67ad..aee7faadd 100644
--- a/sale_rental_extension/i18n/ca.po
+++ b/sale_rental_extension/i18n/ca.po
@@ -64,9 +64,7 @@ msgid "Cancel"
 msgstr "Cancel·la"
 
 #. module: sale_rental
-#. module: sale_rental_extension
 #: model:ir.model.fields.selection,name:sale_rental.selection__sale_rental__state__cancel
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__cancel
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
@@ -486,10 +484,8 @@ msgid "Rental to Sell"
 msgstr "Lloguer a vendre"
 
 #. module: sale_rental
-#. module: sale_rental_extension
 #: model:ir.actions.act_window,name:sale_rental.sale_rental_action
 #: model:ir.ui.menu,name:sale_rental.sale_rental_menu
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
 msgid "Rentals"
 msgstr "Lloguers"
 
@@ -501,11 +497,8 @@ msgid "Rented Product"
 msgstr "Producte llogat"
 
 #. module: sale_rental
-#. module: sale_rental_extension
 #: model_terms:ir.ui.view,arch_db:sale_rental.sale_rental_form
 #: model_terms:ir.ui.view,arch_db:sale_rental.sale_rental_tree
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_today_return
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
 msgid "Return"
 msgstr "Retorn"
 
@@ -686,288 +679,17 @@ msgstr ""
 "d'estoc '%(rental_name)s'! Assegureu-vos que recupereu algunes unitats "
 "mentrestant o reaprovisioneu la ubicació d'estoc '%(rental_name)s'."
 
-#. module: sale_rental_extension
-#. odoo-javascript
-#: code:addons/sale_rental_extension/static/src/js/signature_widget.js:0
-#, python-format
-msgid "Delivery Signature"
-msgstr "Signatura de lliurament"
-
-#. module: sale_rental_extension
-#. odoo-javascript
-#: code:addons/sale_rental_extension/static/src/xml/signature_dialog.xml:0
-#, python-format
-msgid "Confirm & Sign"
-msgstr "Confirmar i signar"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_res_company__rental_signature_terms
-#: model:ir.model.fields,field_description:sale_rental_extension.field_res_config_settings__rental_signature_terms
-msgid "Rental Signature Terms"
-msgstr "Condicions de signatura de lloguer"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.report_delivery_document_rental_signature_terms
-msgid "Conditions"
-msgstr "Condicions"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.report_delivery_document_rental_signature_terms
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.res_config_settings_view_form
-msgid "Signature"
-msgstr "Signatura"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.res_config_settings_view_form
-msgid ""
-"Terms shown in the signature dialog when signing a rental delivery order. "
-"Leave empty to use the default text."
-msgstr ""
-"Condicions mostrades al diàleg de signatura en signar un albarà de lloguer. "
-"Deixeu buit per utilitzar el text per defecte."
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__draft
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Quotation"
-msgstr "Pressupost"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__sent
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Quotation Sent"
-msgstr "Pressupost enviat"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__pickup
-msgid "Reserved"
-msgstr "Reservat"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__return
-msgid "Pickedup"
-msgstr "Recollit"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__returned
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Returned"
-msgstr "Tornat"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Booked"
-msgstr "Reservat"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Late Pickup"
-msgstr "Recollida amb retard"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Picked-up"
-msgstr "Recollit"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Late Return"
-msgstr "Retorn amb retard"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "To Pickup"
-msgstr "Per recollir"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "To Return"
-msgstr "Per retornar"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__rental_duration
-msgid "Duration"
-msgstr "Durada"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__rental_status
-msgid "Rental Status"
-msgstr "Estat del lloguer"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Rental Period"
-msgstr "Període de lloguer"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Update Times"
-msgstr "Actualitzar dates"
-
-#. module: sale_rental_extension
-#: model:ir.actions.act_window,name:sale_rental_extension.rental_order_action
-msgid "Rental Orders"
-msgstr "Comandes de lloguer"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Search Rental Orders"
-msgstr "Cerca comandes de lloguer"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "My Orders"
-msgstr "Les meves comandes"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_today
-msgid "To Do Today"
-msgstr "Avui"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_kanban
-msgid "Late"
-msgstr "Retard"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Pickup Date"
-msgstr "Data de recollida"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Return Date"
-msgstr "Data de devolució"
-
-#. module: sale_rental_extension
-#: model:ir.actions.act_window,name:sale_rental_extension.rental_order_today_pickup_action
-msgid "Pickups Today"
-msgstr "Recollides avui"
-
-#. module: sale_rental_extension
-#: model:ir.actions.act_window,name:sale_rental_extension.rental_order_today_return_action
-msgid "Returns Today"
-msgstr "Devolucions avui"
-
-#. module: sale_rental_extension
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_order_group
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_orders
-msgid "Orders"
-msgstr "Comandes"
-
-#. module: sale_rental_extension
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_today_pickup
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Pickup"
-msgstr "Recollida"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Qty"
-msgstr "Qtat"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_action
-msgid "Create a new rental order!"
-msgstr "Crea una nova comanda de lloguer!"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_kanban
-msgid "Pickup:"
-msgstr "Recollida:"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_kanban
-msgid "Return:"
-msgstr "Retorn:"
-
 #. module: sale_rental_extension
 #: model_terms:ir.ui.view,arch_db:sale_rental_extension.sale_rental_view_kanban
 msgid "<i class=\"fa fa-calendar me-1\" title=\"Rental period\"/>"
 msgstr "<i class=\"fa fa-calendar me-1\" title=\"Període de lloguer\"/>"
 
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_kanban
-msgid "<i class=\"fa fa-warning me-1\" title=\"Late\"/>"
-msgstr "<i class=\"fa fa-warning me-1\" title=\"Endarrerit\"/>"
-
 #. module: sale_rental_extension
 #: model_terms:ir.ui.view,arch_db:sale_rental_extension.sale_rental_view_kanban
 msgid "<span class=\"mx-1\">→</span>"
 msgstr "<span class=\"mx-1\">→</span>"
 
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__is_late
-msgid "Is Late"
-msgstr "Endarrerit"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__is_rental_order
-msgid "Is Rental Order"
-msgstr "És comanda de lloguer"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_stock_picking__is_rental_picking
-msgid "Is Rental Picking"
-msgstr "És albarà de lloguer"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__next_action_date
-msgid "Next Action Date"
-msgstr "Data propera acció"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Order"
-msgstr "Comanda"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__pickup_picking_id
-msgid "Pickup Picking"
-msgstr "Albarà de recollida"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__return_picking_id
-msgid "Return Picking"
-msgstr "Albarà de retorn"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_res_company__rental_require_signature_validation
-#: model:ir.model.fields,field_description:sale_rental_extension.field_res_config_settings__rental_require_signature_validation
-#: model:ir.model.fields,field_description:sale_rental_extension.field_stock_picking__rental_require_signature_validation
-msgid "Rental Require Signature Validation"
-msgstr "Requerir signatura per validar lloguer"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.res_config_settings_view_form
-msgid "Require Signature to Validate Delivery"
-msgstr "Requerir signatura per validar l'entrega"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.res_config_settings_view_form
-msgid "When enabled, rental delivery orders can only be validated by signing. The Validate button is replaced by the Sign button."
-msgstr "Si s'activa, les entregues de lloguer només es poden validar amb signatura. El botó Validar se substitueix pel botó Signar."
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.view_picking_form
-msgid "Sign"
-msgstr "Signar"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Salesperson"
-msgstr "Comercial"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Status"
-msgstr "Estat"
-
 #. module: sale_rental_extension
 #: model_terms:ir.ui.view,arch_db:sale_rental_extension.sale_rental_search
 msgid "Today"
 msgstr "Avui"
-
-
diff --git a/sale_rental_extension/i18n/es.po b/sale_rental_extension/i18n/es.po
index cc6eb9365..0be6226eb 100644
--- a/sale_rental_extension/i18n/es.po
+++ b/sale_rental_extension/i18n/es.po
@@ -64,9 +64,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: sale_rental
-#. module: sale_rental_extension
 #: model:ir.model.fields.selection,name:sale_rental.selection__sale_rental__state__cancel
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__cancel
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -486,10 +484,8 @@ msgid "Rental to Sell"
 msgstr "Alquiler a vender"
 
 #. module: sale_rental
-#. module: sale_rental_extension
 #: model:ir.actions.act_window,name:sale_rental.sale_rental_action
 #: model:ir.ui.menu,name:sale_rental.sale_rental_menu
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
 msgid "Rentals"
 msgstr "Alquileres"
 
@@ -501,11 +497,8 @@ msgid "Rented Product"
 msgstr "Producto alquilado"
 
 #. module: sale_rental
-#. module: sale_rental_extension
 #: model_terms:ir.ui.view,arch_db:sale_rental.sale_rental_form
 #: model_terms:ir.ui.view,arch_db:sale_rental.sale_rental_tree
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_today_return
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
 msgid "Return"
 msgstr "Retorno"
 
@@ -686,288 +679,17 @@ msgstr ""
 "stock '%(rental_name)s'. Asegúrese de recuperar algunas unidades mientras "
 "tanto o reaprovisione la ubicación de stock '%(rental_name)s'."
 
-#. module: sale_rental_extension
-#. odoo-javascript
-#: code:addons/sale_rental_extension/static/src/js/signature_widget.js:0
-#, python-format
-msgid "Delivery Signature"
-msgstr "Firma de entrega"
-
-#. module: sale_rental_extension
-#. odoo-javascript
-#: code:addons/sale_rental_extension/static/src/xml/signature_dialog.xml:0
-#, python-format
-msgid "Confirm & Sign"
-msgstr "Confirmar y firmar"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_res_company__rental_signature_terms
-#: model:ir.model.fields,field_description:sale_rental_extension.field_res_config_settings__rental_signature_terms
-msgid "Rental Signature Terms"
-msgstr "Condiciones de firma de alquiler"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.report_delivery_document_rental_signature_terms
-msgid "Conditions"
-msgstr "Condiciones"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.report_delivery_document_rental_signature_terms
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.res_config_settings_view_form
-msgid "Signature"
-msgstr "Firma"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.res_config_settings_view_form
-msgid ""
-"Terms shown in the signature dialog when signing a rental delivery order. "
-"Leave empty to use the default text."
-msgstr ""
-"Condiciones mostradas en el diálogo de firma al firmar un albarán de alquiler. "
-"Dejar vacío para utilizar el texto por defecto."
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__draft
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Quotation"
-msgstr "Presupuesto"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__sent
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Quotation Sent"
-msgstr "Presupuesto enviado"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__pickup
-msgid "Reserved"
-msgstr "Reservado"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__return
-msgid "Pickedup"
-msgstr "Recogida"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields.selection,name:sale_rental_extension.selection__sale_order__rental_status__returned
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Returned"
-msgstr "Devuelto"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Booked"
-msgstr "Reservado"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Late Pickup"
-msgstr "Recogida con retraso"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Picked-up"
-msgstr "Recogida"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Late Return"
-msgstr "Retorno con retraso"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "To Pickup"
-msgstr "Por recoger"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "To Return"
-msgstr "Por devolver"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__rental_duration
-msgid "Duration"
-msgstr "Duración"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__rental_status
-msgid "Rental Status"
-msgstr "Estado de alquiler"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Rental Period"
-msgstr "Periodo de alquiler"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Update Times"
-msgstr "Actualizar fechas"
-
-#. module: sale_rental_extension
-#: model:ir.actions.act_window,name:sale_rental_extension.rental_order_action
-msgid "Rental Orders"
-msgstr "Órdenes de alquiler"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Search Rental Orders"
-msgstr "Buscar órdenes de alquiler"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "My Orders"
-msgstr "Mis pedidos"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_today
-msgid "To Do Today"
-msgstr "Hoy"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_kanban
-msgid "Late"
-msgstr "Retraso"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Pickup Date"
-msgstr "Fecha de recogida"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Return Date"
-msgstr "Fecha de retorno"
-
-#. module: sale_rental_extension
-#: model:ir.actions.act_window,name:sale_rental_extension.rental_order_today_pickup_action
-msgid "Pickups Today"
-msgstr "Recogidas hoy"
-
-#. module: sale_rental_extension
-#: model:ir.actions.act_window,name:sale_rental_extension.rental_order_today_return_action
-msgid "Returns Today"
-msgstr "Devoluciones hoy"
-
-#. module: sale_rental_extension
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_order_group
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_orders
-msgid "Orders"
-msgstr "Pedidos"
-
-#. module: sale_rental_extension
-#: model:ir.ui.menu,name:sale_rental_extension.menu_rental_today_pickup
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Pickup"
-msgstr "Recogida"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_form_view
-msgid "Qty"
-msgstr "Ctd"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_action
-msgid "Create a new rental order!"
-msgstr "¡Crea una nueva orden de alquiler!"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_kanban
-msgid "Pickup:"
-msgstr "Recogida:"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_kanban
-msgid "Return:"
-msgstr "Retorno:"
-
 #. module: sale_rental_extension
 #: model_terms:ir.ui.view,arch_db:sale_rental_extension.sale_rental_view_kanban
 msgid "<i class=\"fa fa-calendar me-1\" title=\"Rental period\"/>"
 msgstr "<i class=\"fa fa-calendar me-1\" title=\"Período de alquiler\"/>"
 
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_kanban
-msgid "<i class=\"fa fa-warning me-1\" title=\"Late\"/>"
-msgstr "<i class=\"fa fa-warning me-1\" title=\"Atrasado\"/>"
-
 #. module: sale_rental_extension
 #: model_terms:ir.ui.view,arch_db:sale_rental_extension.sale_rental_view_kanban
 msgid "<span class=\"mx-1\">→</span>"
 msgstr "<span class=\"mx-1\">→</span>"
 
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__is_late
-msgid "Is Late"
-msgstr "Atrasado"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__is_rental_order
-msgid "Is Rental Order"
-msgstr "Es pedido de alquiler"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_stock_picking__is_rental_picking
-msgid "Is Rental Picking"
-msgstr "Es albarán de alquiler"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__next_action_date
-msgid "Next Action Date"
-msgstr "Fecha próxima acción"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__pickup_picking_id
-msgid "Pickup Picking"
-msgstr "Albarán de recogida"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_sale_order__return_picking_id
-msgid "Return Picking"
-msgstr "Albarán de retorno"
-
-#. module: sale_rental_extension
-#: model:ir.model.fields,field_description:sale_rental_extension.field_res_company__rental_require_signature_validation
-#: model:ir.model.fields,field_description:sale_rental_extension.field_res_config_settings__rental_require_signature_validation
-#: model:ir.model.fields,field_description:sale_rental_extension.field_stock_picking__rental_require_signature_validation
-msgid "Rental Require Signature Validation"
-msgstr "Requerir firma para validar alquiler"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.res_config_settings_view_form
-msgid "Require Signature to Validate Delivery"
-msgstr "Requerir firma para validar la entrega"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.res_config_settings_view_form
-msgid "When enabled, rental delivery orders can only be validated by signing. The Validate button is replaced by the Sign button."
-msgstr "Si se activa, las entregas de alquiler solo se pueden validar con firma. El botón Validar se sustituye por el botón Firmar."
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.view_picking_form
-msgid "Sign"
-msgstr "Firmar"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Salesperson"
-msgstr "Comercial"
-
-#. module: sale_rental_extension
-#: model_terms:ir.ui.view,arch_db:sale_rental_extension.rental_order_view_search
-msgid "Status"
-msgstr "Estado"
-
 #. module: sale_rental_extension
 #: model_terms:ir.ui.view,arch_db:sale_rental_extension.sale_rental_search
 msgid "Today"
 msgstr "Hoy"
-
-
diff --git a/sale_rental_extension/models/__init__.py b/sale_rental_extension/models/__init__.py
index ba1c090c8..8eb9d1d40 100644
--- a/sale_rental_extension/models/__init__.py
+++ b/sale_rental_extension/models/__init__.py
@@ -1,4 +1 @@
-from . import res_company
-from . import res_config_settings
-from . import sale_order
-from . import stock_picking
+from . import sale_order_line
diff --git a/sale_rental_extension/models/res_company.py b/sale_rental_extension/models/res_company.py
deleted file mode 100644
index 3318f68c6..000000000
--- a/sale_rental_extension/models/res_company.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-
-from odoo import fields, models
-
-
-class ResCompany(models.Model):
-    _inherit = "res.company"
-
-    rental_require_signature_validation = fields.Boolean()
-
-    rental_signature_terms = fields.Html(
-        translate=True,
-    )
diff --git a/sale_rental_extension/models/res_config_settings.py b/sale_rental_extension/models/res_config_settings.py
deleted file mode 100644
index 22ba917a6..000000000
--- a/sale_rental_extension/models/res_config_settings.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-
-from odoo import fields, models
-
-
-class ResConfigSettings(models.TransientModel):
-    _inherit = "res.config.settings"
-
-    rental_require_signature_validation = fields.Boolean(
-        related="company_id.rental_require_signature_validation",
-        readonly=False,
-    )
-
-    rental_signature_terms = fields.Html(
-        related="company_id.rental_signature_terms",
-        readonly=False,
-    )
diff --git a/sale_rental_extension/models/sale_order.py b/sale_rental_extension/models/sale_order.py
deleted file mode 100644
index 61d10ebe0..000000000
--- a/sale_rental_extension/models/sale_order.py
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-
-from odoo import _, api, fields, models
-from odoo.exceptions import UserError
-
-RENTAL_STATUS = [
-    ("draft", "Quotation"),
-    ("sent", "Quotation Sent"),
-    ("pickup", "Reserved"),
-    ("return", "Pickedup"),
-    ("returned", "Returned"),
-    ("cancel", "Cancelled"),
-]
-
-
-class SaleOrder(models.Model):
-    _inherit = "sale.order"
-
-    rental_ids = fields.One2many(
-        comodel_name="sale.rental",
-        inverse_name="start_order_id",
-    )
-    is_rental_order = fields.Boolean(
-        compute="_compute_is_rental_order",
-        store=True,
-    )
-    rental_status = fields.Selection(
-        selection=RENTAL_STATUS,
-        compute="_compute_rental_status",
-        store=True,
-    )
-    next_action_date = fields.Date(
-        compute="_compute_rental_status",
-        store=True,
-    )
-    is_late = fields.Boolean(
-        compute="_compute_is_late",
-    )
-    rental_duration = fields.Integer(
-        string="Duration",
-        compute="_compute_rental_duration",
-    )
-    pickup_picking_id = fields.Many2one(
-        comodel_name="stock.picking",
-        compute="_compute_rental_picking_ids",
-    )
-    return_picking_id = fields.Many2one(
-        comodel_name="stock.picking",
-        compute="_compute_rental_picking_ids",
-    )
-
-    def _get_rental_type(self):
-        return self.env.ref("rental_base.rental_sale_type", raise_if_not_found=False)
-
-    @api.depends("type_id")
-    def _compute_is_rental_order(self):
-        rental_type = self._get_rental_type()
-        for order in self:
-            order.is_rental_order = bool(rental_type and order.type_id == rental_type)
-
-    @api.depends(
-        "state",
-        "is_rental_order",
-        "rental_ids.state",
-        "default_start_date",
-        "default_end_date",
-    )
-    def _compute_rental_status(self):
-        for order in self:
-            order.next_action_date = False
-            if not order.is_rental_order:
-                order.rental_status = False
-            elif order.state in ("draft", "sent", "cancel"):
-                order.rental_status = order.state
-            elif order.state in ("sale", "done"):
-                rental_states = order.rental_ids.mapped("state")
-                if not rental_states or any(s == "ordered" for s in rental_states):
-                    order.rental_status = "pickup"
-                    order.next_action_date = order.default_start_date
-                elif any(s in ("out", "sell_progress") for s in rental_states):
-                    order.rental_status = "return"
-                    order.next_action_date = order.default_end_date
-                else:
-                    order.rental_status = "returned"
-
-    @api.depends("default_start_date", "default_end_date")
-    def _compute_rental_duration(self):
-        for order in self:
-            if order.default_start_date and order.default_end_date:
-                order.rental_duration = (
-                    order.default_end_date - order.default_start_date
-                ).days + 1
-            else:
-                order.rental_duration = 0
-
-    @api.depends(
-        "rental_ids.out_move_id.picking_id", "rental_ids.in_move_id.picking_id"
-    )
-    def _compute_rental_picking_ids(self):
-        for order in self:
-            order.pickup_picking_id = order.rental_ids.mapped("out_move_id.picking_id")[
-                :1
-            ]
-            order.return_picking_id = order.rental_ids.mapped("in_move_id.picking_id")[
-                :1
-            ]
-
-    def action_open_pickup_picking(self):
-        self.ensure_one()
-        return {
-            "type": "ir.actions.act_window",
-            "res_model": "stock.picking",
-            "res_id": self.pickup_picking_id.id,
-            "view_mode": "form",
-            "views": [(False, "form")],
-        }
-
-    def action_open_return_picking(self):
-        self.ensure_one()
-        return {
-            "type": "ir.actions.act_window",
-            "res_model": "stock.picking",
-            "res_id": self.return_picking_id.id,
-            "view_mode": "form",
-            "views": [(False, "form")],
-        }
-
-    @api.depends("next_action_date")
-    def _compute_is_late(self):
-        today = fields.Date.today()
-        for order in self:
-            order.is_late = bool(
-                order.next_action_date and order.next_action_date < today
-            )
-
-
-class SaleOrderLine(models.Model):
-    _inherit = "sale.order.line"
-
-    rental_qty = fields.Float(
-        readonly=True,
-        states={
-            "draft": [("readonly", False)],
-            "sent": [("readonly", False)],
-            "sale": [("readonly", False)],
-        },
-    )
-
-    @api.onchange("product_id", "rental_qty")
-    def rental_product_id_change(self):
-        res = super().rental_product_id_change()
-        if (
-            self.product_id.rented_product_id
-            and self.rental_type == "new_rental"
-            and not self.rental_qty
-        ):
-            self.rental_qty = 1
-        return res
-
-    def _action_launch_stock_rule(self, previous_product_uom_qty=False):
-        if self._context.get("skip_procurement"):
-            return True
-        return super()._action_launch_stock_rule(
-            previous_product_uom_qty=previous_product_uom_qty
-        )
-
-    def write(self, values):
-        if "rental_qty" in values:
-            rental_lines = self.filtered(
-                lambda l: l.state in ("sale", "done")
-                and l.rental_type == "new_rental"
-                and l.product_id.rented_product_id
-            )
-            for line in rental_lines:
-                rental = self.env["sale.rental"].search(
-                    [("start_order_line_id", "=", line.id)], limit=1
-                )
-                if rental and rental.out_move_id.state == "done":
-                    raise UserError(
-                        _(
-                            "Cannot change rental quantity after pickup "
-                            "for product '%s'.",
-                            line.product_id.display_name,
-                        )
-                    )
-        else:
-            rental_lines = self.env["sale.order.line"]
-
-        res = super().write(values)
-
-        for line in rental_lines:
-            new_qty = line.rental_qty * line.number_of_days
-            if line.product_uom_qty != new_qty:
-                line.with_context(skip_procurement=True).write(
-                    {"product_uom_qty": new_qty}
-                )
-            rental = self.env["sale.rental"].search(
-                [("start_order_line_id", "=", line.id)], limit=1
-            )
-            if rental:
-                moves_to_update = self.env["stock.move"]
-                if rental.out_move_id and rental.out_move_id.state not in (
-                    "done",
-                    "cancel",
-                ):
-                    moves_to_update |= rental.out_move_id
-                if rental.in_move_id and rental.in_move_id.state not in (
-                    "done",
-                    "cancel",
-                ):
-                    moves_to_update |= rental.in_move_id
-                if moves_to_update:
-                    moves_to_update.move_line_ids.write({"qty_done": 0})
-                    moves_to_update.write({"product_uom_qty": line.rental_qty})
-
-        return res
diff --git a/sale_rental_extension/models/sale_order_line.py b/sale_rental_extension/models/sale_order_line.py
new file mode 100644
index 000000000..7c78ca173
--- /dev/null
+++ b/sale_rental_extension/models/sale_order_line.py
@@ -0,0 +1,87 @@
+# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    rental_qty = fields.Float(
+        readonly=True,
+        states={
+            "draft": [("readonly", False)],
+            "sent": [("readonly", False)],
+            "sale": [("readonly", False)],
+        },
+    )
+
+    @api.onchange("product_id", "rental_qty")
+    def rental_product_id_change(self):
+        res = super().rental_product_id_change()
+        if (
+            self.product_id.rented_product_id
+            and self.rental_type == "new_rental"
+            and not self.rental_qty
+        ):
+            self.rental_qty = 1
+        return res
+
+    def _action_launch_stock_rule(self, previous_product_uom_qty=False):
+        if self._context.get("skip_procurement"):
+            return True
+        return super()._action_launch_stock_rule(
+            previous_product_uom_qty=previous_product_uom_qty
+        )
+
+    def write(self, values):
+        if "rental_qty" in values:
+            rental_lines = self.filtered(
+                lambda l: l.state in ("sale", "done")
+                and l.rental_type == "new_rental"
+                and l.product_id.rented_product_id
+            )
+            for line in rental_lines:
+                rental = self.env["sale.rental"].search(
+                    [("start_order_line_id", "=", line.id)], limit=1
+                )
+                if rental and rental.out_move_id.state == "done":
+                    raise UserError(
+                        _(
+                            "Cannot change rental quantity after pickup "
+                            "for product '%s'.",
+                            line.product_id.display_name,
+                        )
+                    )
+        else:
+            rental_lines = self.env["sale.order.line"]
+
+        res = super().write(values)
+
+        for line in rental_lines:
+            new_qty = line.rental_qty * line.number_of_days
+            if line.product_uom_qty != new_qty:
+                line.with_context(skip_procurement=True).write(
+                    {"product_uom_qty": new_qty}
+                )
+            rental = self.env["sale.rental"].search(
+                [("start_order_line_id", "=", line.id)], limit=1
+            )
+            if rental:
+                moves_to_update = self.env["stock.move"]
+                if rental.out_move_id and rental.out_move_id.state not in (
+                    "done",
+                    "cancel",
+                ):
+                    moves_to_update |= rental.out_move_id
+                if rental.in_move_id and rental.in_move_id.state not in (
+                    "done",
+                    "cancel",
+                ):
+                    moves_to_update |= rental.in_move_id
+                if moves_to_update:
+                    moves_to_update.move_line_ids.write({"qty_done": 0})
+                    moves_to_update.write({"product_uom_qty": line.rental_qty})
+
+        return res
diff --git a/sale_rental_extension/models/stock_picking.py b/sale_rental_extension/models/stock_picking.py
deleted file mode 100644
index a3f750091..000000000
--- a/sale_rental_extension/models/stock_picking.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-
-from odoo import api, fields, models
-
-
-class StockPicking(models.Model):
-    _inherit = "stock.picking"
-
-    is_rental_picking = fields.Boolean(
-        compute="_compute_is_rental_picking",
-    )
-
-    rental_require_signature_validation = fields.Boolean(
-        related="company_id.rental_require_signature_validation",
-    )
-
-    @api.depends("sale_id.type_id")
-    def _compute_is_rental_picking(self):
-        rental_type = self.env.ref(
-            "rental_base.rental_sale_type", raise_if_not_found=False
-        )
-        for picking in self:
-            picking.is_rental_picking = bool(
-                rental_type
-                and picking.sale_id
-                and picking.sale_id.type_id == rental_type
-            )
-
-    def _attach_sign(self):
-        res = super()._attach_sign()
-        if (
-            self.is_rental_picking
-            and self.company_id.rental_require_signature_validation
-            and self.state != "done"
-        ):
-            self.with_context(
-                skip_immediate=True,
-                skip_backorder=True,
-            ).button_validate()
-        return res
diff --git a/sale_rental_extension/readme/DESCRIPTION.rst b/sale_rental_extension/readme/DESCRIPTION.rst
index 898705bac..dc13bac79 100644
--- a/sale_rental_extension/readme/DESCRIPTION.rst
+++ b/sale_rental_extension/readme/DESCRIPTION.rst
@@ -2,7 +2,6 @@ This module extends ``sale_rental`` to improve the rental positions experience:
 
 * Kanban and calendar views for the Rental Positions screen
 * Searchpanel with state filter and "Today" filter
-* Configurable signature terms for rental delivery orders
-  (Settings → Rental → Signature)
-* Custom signature dialog with "Confirm & Sign" button on rental pickings
+* Rental quantity defaults to 1 when adding a rental product
+* Rental quantity can be edited on confirmed orders (before pickup)
 * Catalan and Spanish translations
diff --git a/sale_rental_extension/report/report_deliveryslip.xml b/sale_rental_extension/report/report_deliveryslip.xml
deleted file mode 100644
index 98f5c2494..000000000
--- a/sale_rental_extension/report/report_deliveryslip.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-<odoo>
-    <template
-        id="report_delivery_document_rental_signature_terms"
-        inherit_id="stock.report_delivery_document"
-    >
-        <xpath expr="//div[@name='signature']" position="attributes">
-            <attribute
-                name="t-if"
-            >o.signature and not (o.is_rental_picking and o.company_id.rental_signature_terms)</attribute>
-        </xpath>
-        <xpath expr="//div[@name='signature']" position="after">
-            <div
-                t-if="o.signature and o.is_rental_picking and o.company_id.rental_signature_terms"
-                class="mt32"
-            >
-                <div class="row">
-                    <div class="col-8">
-                        <strong>Conditions</strong>
-                        <div
-                            class="small mt4"
-                            t-out="o.company_id.rental_signature_terms"
-                        />
-                    </div>
-                    <div class="col-4 text-center">
-                        <strong>Signature</strong>
-                        <div>
-                            <img
-                                t-att-src="image_data_uri(o.signature)"
-                                style="max-height: 4cm; max-width: 8cm;"
-                            />
-                        </div>
-                        <p t-field="o.partner_id.name" />
-                    </div>
-                </div>
-            </div>
-        </xpath>
-    </template>
-</odoo>
diff --git a/sale_rental_extension/static/description/index.html b/sale_rental_extension/static/description/index.html
index d56aecd42..252ebcae1 100644
--- a/sale_rental_extension/static/description/index.html
+++ b/sale_rental_extension/static/description/index.html
@@ -379,9 +379,8 @@ <h1>Sale Rental Extension</h1>
 <ul class="simple">
 <li>Kanban and calendar views for the Rental Positions screen</li>
 <li>Searchpanel with state filter and “Today” filter</li>
-<li>Configurable signature terms for rental delivery orders
-(Settings → Rental → Signature)</li>
-<li>Custom signature dialog with “Confirm &amp; Sign” button on rental pickings</li>
+<li>Rental quantity defaults to 1 when adding a rental product</li>
+<li>Rental quantity can be edited on confirmed orders (before pickup)</li>
 <li>Catalan and Spanish translations</li>
 </ul>
 <div class="admonition important">
diff --git a/sale_rental_extension/static/src/js/.eslintrc.yml b/sale_rental_extension/static/src/js/.eslintrc.yml
deleted file mode 100644
index add5a7856..000000000
--- a/sale_rental_extension/static/src/js/.eslintrc.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-parserOptions:
-  sourceType: module
diff --git a/sale_rental_extension/static/src/js/signature_widget.js b/sale_rental_extension/static/src/js/signature_widget.js
deleted file mode 100644
index a91d14c4d..000000000
--- a/sale_rental_extension/static/src/js/signature_widget.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/** @odoo-module */
-/* Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-   License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
-
-import {SignatureDialog} from "@web/core/signature/signature_dialog";
-import {SignatureWidget} from "@web/views/widgets/signature/signature";
-import {patch} from "web.utils";
-
-patch(SignatureWidget.prototype, "sale_rental_extension.SignatureWidget", {
-    async onClickSignature() {
-        const {record} = this.props;
-        const isRental =
-            record.resModel === "stock.picking" && record.data.is_rental_picking;
-        if (!isRental) {
-            return this._super(...arguments);
-        }
-        const companyId = record.data.company_id && record.data.company_id[0];
-        let rentalTerms = "";
-        if (companyId) {
-            const result = await this.orm.read(
-                "res.company",
-                [companyId],
-                ["rental_signature_terms"]
-            );
-            if (result.length && result[0].rental_signature_terms) {
-                rentalTerms = owl.markup(result[0].rental_signature_terms);
-            }
-        }
-        const nameAndSignatureProps = {
-            mode: "draw",
-            displaySignatureRatio: 3,
-            signatureType: "signature",
-            noInputName: true,
-        };
-        const {fullName} = this.props;
-        let defaultName = "";
-        if (fullName) {
-            let signName = null;
-            const fullNameData = record.data[fullName];
-            if (record.fields[fullName].type === "many2one") {
-                signName = fullNameData && fullNameData[1];
-            } else {
-                signName = fullNameData;
-            }
-            defaultName = signName === "" ? undefined : signName;
-        }
-        nameAndSignatureProps.defaultFont = this.props.defaultFont;
-        const dialogProps = {
-            defaultName,
-            nameAndSignatureProps,
-            uploadSignature: (data) => this.uploadSignature(data),
-            isRental: true,
-            rentalTerms,
-        };
-        this.dialogService.add(SignatureDialog, dialogProps);
-    },
-});
-
-patch(SignatureDialog.prototype, "sale_rental_extension.SignatureDialog", {
-    setup() {
-        this._super(...arguments);
-        if (this.props.isRental) {
-            this.title = this.env._t("Delivery Signature");
-        }
-    },
-});
diff --git a/sale_rental_extension/static/src/scss/sale_rental_kanban.scss b/sale_rental_extension/static/src/scss/sale_rental_kanban.scss
deleted file mode 100644
index 3475c2e29..000000000
--- a/sale_rental_extension/static/src/scss/sale_rental_kanban.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-// License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-
-// Prevent the image zoom popup from capturing mouse events.
-// Without this, hovering over a small thumbnail causes flickering:
-// mouse enters popup → leaves thumbnail → popup closes → loop.
-.o_popover:has(.o_image_zoom) {
-    pointer-events: none;
-}
diff --git a/sale_rental_extension/static/src/xml/signature_dialog.xml b/sale_rental_extension/static/src/xml/signature_dialog.xml
deleted file mode 100644
index 7d5f562fa..000000000
--- a/sale_rental_extension/static/src/xml/signature_dialog.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-<templates xml:space="preserve">
-
-    <t
-        t-name="sale_rental_extension.SignatureDialog"
-        t-inherit="web.SignatureDialog"
-        t-inherit-mode="extension"
-        owl="1"
-    >
-        <xpath expr="//div[hasclass('mt16')]" position="replace">
-            <div
-                t-if="props.rentalTerms"
-                class="mt16 small"
-                t-out="props.rentalTerms"
-            />
-            <div
-                t-else=""
-                class="mt16 small"
-            >By clicking Adopt &amp; Sign, I agree that the chosen signature/initials will be a valid electronic representation of my hand-written signature/initials for all purposes when it is used on documents, including legally binding contracts.</div>
-        </xpath>
-        <xpath expr="//button[hasclass('btn-primary')]" position="replace">
-            <button
-                t-if="props.isRental"
-                class="btn btn-primary"
-                t-att-disabled="signature.isSignatureEmpty"
-                t-on-click="onClickConfirm"
-            >Confirm &amp; Sign</button>
-            <button
-                t-else=""
-                class="btn btn-primary"
-                t-att-disabled="signature.isSignatureEmpty"
-                t-on-click="onClickConfirm"
-            >Adopt &amp; Sign</button>
-        </xpath>
-    </t>
-
-</templates>
diff --git a/sale_rental_extension/tests/__init__.py b/sale_rental_extension/tests/__init__.py
deleted file mode 100644
index 95d8a8bce..000000000
--- a/sale_rental_extension/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import test_rental_status
diff --git a/sale_rental_extension/tests/test_rental_status.py b/sale_rental_extension/tests/test_rental_status.py
deleted file mode 100644
index 18cfc709b..000000000
--- a/sale_rental_extension/tests/test_rental_status.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-
-from datetime import timedelta
-
-from odoo import fields
-from odoo.tests import common, tagged
-
-
-@tagged("post_install", "-at_install")
-class TestRentalStatus(common.TransactionCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.category_all = cls.env.ref("product.product_category_all")
-        cls.rental_sale_type = cls.env.ref("rental_base.rental_sale_type")
-        cls.uom_day = cls.env.ref("uom.product_uom_day")
-        cls.warehouse0 = cls.env.ref("stock.warehouse0")
-        cls.partner = cls.env["res.partner"].create(
-            {
-                "name": "Test Partner",
-                "email": "test@test.com",
-            }
-        )
-        cls.product_hw = cls.env["product.product"].create(
-            {
-                "name": "Rental Hardware",
-                "type": "product",
-                "categ_id": cls.category_all.id,
-            }
-        )
-        cls.service_rental = (
-            cls.env["create.rental.product"]
-            .with_context(active_model="product.product", active_id=cls.product_hw.id)
-            .create(
-                {
-                    "hw_product_id": cls.product_hw.id,
-                    "name": "Rental of Rental Hardware (Day)",
-                    "categ_id": cls.product_hw.categ_id.id,
-                    "copy_image": True,
-                }
-            )
-            .create_rental_product()
-        )
-        cls.service_rental = cls.env["product.product"].browse(
-            cls.service_rental["res_id"]
-        )
-        cls.service_rental.write(
-            {
-                "uom_id": cls.uom_day.id,
-                "uom_po_id": cls.uom_day.id,
-                "list_price": 100,
-            }
-        )
-        cls.service_rental.rental = True
-
-    def _create_rental_order(self, **kwargs):
-        today = fields.Date.today()
-        date_start = kwargs.get("date_start", today + timedelta(days=1))
-        date_end = kwargs.get("date_end", today + timedelta(days=5))
-        date_qty = (date_end - date_start).days + 1
-        return self.env["sale.order"].create(
-            {
-                "type_id": self.rental_sale_type.id,
-                "partner_id": self.partner.id,
-                "partner_invoice_id": self.partner.id,
-                "partner_shipping_id": self.partner.id,
-                "pricelist_id": self.env.ref("product.list0").id,
-                "picking_policy": "direct",
-                "warehouse_id": self.warehouse0.id,
-                "order_line": [
-                    (
-                        0,
-                        0,
-                        {
-                            "name": "Rental Service",
-                            "product_id": self.service_rental.id,
-                            "rental": True,
-                            "rental_type": "new_rental",
-                            "rental_qty": 1,
-                            "product_uom_qty": date_qty,
-                            "start_date": date_start,
-                            "end_date": date_end,
-                            "price_unit": 100,
-                            "product_uom": self.uom_day.id,
-                        },
-                    )
-                ],
-            }
-        )
-
-    def _create_and_confirm_rental_order(self):
-        order = self._create_rental_order()
-        order.action_confirm()
-        return order
-
-    def test_confirmed_rental_status_pickup(self):
-        """Confirmed rental with sale.rental records should have 'pickup' status."""
-        order = self._create_and_confirm_rental_order()
-        self.assertTrue(order.rental_ids)
-        self.assertEqual(order.rental_status, "pickup")
-
-    def test_confirmed_rental_status_pickup_product_without_rental_flag(self):
-        """Confirmed rental with product missing rental=True on template
-        should still be recognized as a rental order."""
-        self.service_rental.rental = False
-        order = self._create_and_confirm_rental_order()
-        self.assertTrue(order.is_rental_order)
-        self.assertTrue(order.rental_ids)
-        self.assertEqual(order.rental_status, "pickup")
-
-    def test_confirmed_rental_status_pickup_without_rental_records(self):
-        """Confirmed rental order without sale.rental records should be 'pickup',
-        not 'returned'. This happens when a product is not a proper rental
-        service (missing rented_product_id) but the order is created from
-        the rental menu."""
-        order = self._create_and_confirm_rental_order()
-        order.rental_ids.unlink()
-        order._compute_rental_status()
-        self.assertFalse(order.rental_ids)
-        self.assertEqual(order.rental_status, "pickup")
-
-    def test_rental_status_draft(self):
-        """Draft rental order should have 'draft' status."""
-        order = self._create_rental_order()
-        self.assertEqual(order.rental_status, "draft")
-
-    def test_rental_status_cancel(self):
-        """Cancelled rental order should have 'cancel' status."""
-        order = self._create_and_confirm_rental_order()
-        order._action_cancel()
-        self.assertEqual(order.rental_status, "cancel")
-
-    def test_rental_status_return(self):
-        """Rental with completed outgoing picking should have 'return' status."""
-        order = self._create_and_confirm_rental_order()
-        rental = order.rental_ids
-        out_picking = rental.out_move_id.picking_id
-        out_picking.action_assign()
-        out_picking.move_ids.quantity_done = out_picking.move_ids.product_uom_qty
-        out_picking.button_validate()
-        self.assertEqual(order.rental_status, "return")
-
-    def test_rental_status_returned(self):
-        """Rental with both pickings completed should have 'returned' status."""
-        order = self._create_and_confirm_rental_order()
-        rental = order.rental_ids
-        out_picking = rental.out_move_id.picking_id
-        out_picking.action_assign()
-        out_picking.move_ids.quantity_done = out_picking.move_ids.product_uom_qty
-        out_picking.button_validate()
-        in_picking = rental.in_move_id.picking_id
-        in_picking.action_assign()
-        in_picking.move_ids.quantity_done = in_picking.move_ids.product_uom_qty
-        in_picking.button_validate()
-        self.assertEqual(order.rental_status, "returned")
diff --git a/sale_rental_extension/views/res_config_settings_views.xml b/sale_rental_extension/views/res_config_settings_views.xml
deleted file mode 100644
index c06e34da6..000000000
--- a/sale_rental_extension/views/res_config_settings_views.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-<odoo>
-    <record id="res_config_settings_view_form" model="ir.ui.view">
-        <field
-            name="name"
-        >res.config.settings.view.form.inherit.sale_rental_extension</field>
-        <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="rental_base.res_config_settings_view_form" />
-        <field name="arch" type="xml">
-            <div class="app_settings_block" data-key="rental_base" position="inside">
-                <h2>Signature</h2>
-                <div class="row mt16 o_settings_container">
-                    <div class="col-12 o_setting_box">
-                        <div class="o_setting_left_pane">
-                            <field name="rental_require_signature_validation" />
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label
-                                for="rental_require_signature_validation"
-                                string="Require Signature to Validate Delivery"
-                            />
-                            <span
-                                class="fa fa-lg fa-building-o"
-                                title="Values set here are company-specific."
-                                groups="base.group_multi_company"
-                                role="img"
-                            />
-                            <div
-                                class="text-muted"
-                            >When enabled, rental delivery orders can only be validated by signing. The Validate button is replaced by the Sign button.</div>
-                        </div>
-                    </div>
-                    <div class="col-12 o_setting_box">
-                        <div class="o_setting_right_pane">
-                            <label for="rental_signature_terms" />
-                            <span
-                                class="fa fa-lg fa-building-o"
-                                title="Values set here are company-specific."
-                                groups="base.group_multi_company"
-                                role="img"
-                            />
-                            <div
-                                class="text-muted"
-                            >Terms shown in the signature dialog when signing a rental delivery order. Leave empty to use the default text.</div>
-                            <div class="content-group mt16">
-                                <field name="rental_signature_terms" widget="html" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </field>
-    </record>
-</odoo>
diff --git a/sale_rental_extension/views/sale_order_rental_views.xml b/sale_rental_extension/views/sale_order_rental_views.xml
deleted file mode 100644
index d1940d1cb..000000000
--- a/sale_rental_extension/views/sale_order_rental_views.xml
+++ /dev/null
@@ -1,655 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-<odoo>
-
-    <!-- ============================================================ -->
-    <!-- Deactivate rental_base views that modify the standard form   -->
-    <!-- ============================================================ -->
-    <record id="rental_base.sale_rental" model="ir.ui.view">
-        <field name="active" eval="False" />
-    </record>
-    <record id="rental_base.sale_start_end_dates" model="ir.ui.view">
-        <field name="active" eval="False" />
-    </record>
-    <record id="rental_base.sale_stock" model="ir.ui.view">
-        <field name="active" eval="False" />
-    </record>
-    <record id="rental_base.sale_order_type" model="ir.ui.view">
-        <field name="active" eval="False" />
-    </record>
-    <record id="rental_base.view_order_form" model="ir.ui.view">
-        <field name="active" eval="False" />
-    </record>
-
-    <!-- ============================================================ -->
-    <!-- Dedicated Rental Form View (mode=primary)                    -->
-    <!-- ============================================================ -->
-    <record id="rental_order_form_view" model="ir.ui.view">
-        <field name="name">sale.order.form.rental</field>
-        <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_order_form" />
-        <field name="mode">primary</field>
-        <field name="priority">999</field>
-        <field name="arch" type="xml">
-            <!-- Hidden helper fields -->
-            <xpath expr="//field[@name='partner_id']" position="before">
-                <field name="is_rental_order" invisible="1" />
-                <field name="rental_status" invisible="1" />
-                <field name="is_late" invisible="1" />
-                <field name="pickup_picking_id" invisible="1" />
-                <field name="return_picking_id" invisible="1" />
-            </xpath>
-
-            <!-- Hide type_id (always rental in this view) -->
-            <xpath expr="//field[@name='type_id']" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </xpath>
-
-            <!-- Pickup / Return / Update Times buttons -->
-            <xpath expr="//button[@name='action_confirm']" position="after">
-                <button
-                    name="action_open_pickup_picking"
-                    string="Pickup"
-                    type="object"
-                    class="btn-primary"
-                    icon="fa-truck"
-                    attrs="{'invisible': ['|', ('rental_status', '!=', 'pickup'), ('pickup_picking_id', '=', False)]}"
-                />
-                <button
-                    name="action_open_return_picking"
-                    string="Return"
-                    type="object"
-                    class="btn-primary"
-                    icon="fa-undo"
-                    attrs="{'invisible': ['|', ('rental_status', '!=', 'return'), ('return_picking_id', '=', False)]}"
-                />
-                <button
-                    name="%(rental_base.action_update_sale_line_date)d"
-                    string="Update Times"
-                    type="action"
-                    attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}"
-                />
-            </xpath>
-
-            <!-- Rental status badge at top-right (pure state, no late mix) -->
-            <xpath expr="//div[@name='button_box']" position="after">
-                <div
-                    class="badge rounded-pill text-bg-info float-end fs-6 border-0"
-                    attrs="{'invisible': ['|', ('is_rental_order', '=', False), ('rental_status', '!=', 'pickup')]}"
-                >Reserved</div>
-                <div
-                    class="badge rounded-pill text-bg-warning float-end fs-6 border-0"
-                    attrs="{'invisible': ['|', ('is_rental_order', '=', False), ('rental_status', '!=', 'return')]}"
-                >Picked-up</div>
-                <div
-                    class="badge rounded-pill text-bg-success float-end fs-6 border-0"
-                    attrs="{'invisible': ['|', ('is_rental_order', '=', False), ('rental_status', '!=', 'returned')]}"
-                >Returned</div>
-                <!-- Late indicator (separate from state) -->
-                <div
-                    class="badge rounded-pill text-bg-danger float-end fs-6 border-0"
-                    attrs="{'invisible': ['|', ('is_rental_order', '=', False), ('is_late', '=', False)]}"
-                >Late</div>
-            </xpath>
-
-            <!-- Rental period and duration -->
-            <xpath expr="//field[@name='validity_date']" position="after">
-                <label for="default_start_date" string="Rental Period" />
-                <div class="o_row">
-                    <field
-                        name="default_start_date"
-                        widget="daterange"
-                        nolabel="1"
-                        options="{'related_end_date': 'default_end_date'}"
-                    />
-                    <i
-                        class="fa fa-long-arrow-right mx-1"
-                        aria-label="Arrow icon"
-                        title="Arrow"
-                    />
-                    <field
-                        name="default_end_date"
-                        widget="daterange"
-                        nolabel="1"
-                        options="{'related_start_date': 'default_start_date'}"
-                    />
-                </div>
-                <field name="rental_duration" string="Duration" />
-            </xpath>
-
-            <!-- Filter product_id to only show rental products -->
-            <xpath
-                expr="//field[@name='order_line']//form//field[@name='product_id']"
-                position="attributes"
-            >
-                <attribute name="domain">
-                    [('sale_ok', '=', True),
-                     ('rented_product_id', '!=', False),
-                     '|', ('company_id', '=', False),
-                          ('company_id', '=', parent.company_id)]
-                </attribute>
-            </xpath>
-            <xpath
-                expr="//field[@name='order_line']//tree//field[@name='product_id']"
-                position="attributes"
-            >
-                <attribute name="domain">
-                    [('sale_ok', '=', True),
-                     ('rented_product_id', '!=', False),
-                     '|', ('company_id', '=', False),
-                          ('company_id', '=', parent.company_id)]
-                </attribute>
-            </xpath>
-            <!-- Also filter product_template_id (used by sol_product_many2one widget) -->
-            <xpath
-                expr="//field[@name='order_line']//tree//field[@name='product_template_id']"
-                position="attributes"
-            >
-                <attribute name="domain">
-                    [('sale_ok', '=', True),
-                     ('rented_product_tmpl_id', '!=', False),
-                     '|', ('company_id', '=', False),
-                          ('company_id', '=', parent.company_id)]
-                </attribute>
-            </xpath>
-
-            <!-- Add invisible rental fields to tree for onchange support -->
-            <xpath
-                expr="//field[@name='order_line']//tree//field[@name='product_id']"
-                position="after"
-            >
-                <field name="rental" invisible="1" />
-                <field name="can_sell_rental" invisible="1" />
-                <field name="rental_type" invisible="1" />
-            </xpath>
-
-            <!-- Replace product_uom_qty with rental_qty in the same position -->
-            <xpath
-                expr="//field[@name='order_line']//tree//field[@name='product_uom_qty']"
-                position="before"
-            >
-                <field name="rental_qty" string="Qty" />
-            </xpath>
-            <xpath
-                expr="//field[@name='order_line']//tree//field[@name='product_uom_qty']"
-                position="attributes"
-            >
-                <attribute name="invisible">1</attribute>
-            </xpath>
-            <xpath
-                expr="//field[@name='order_line']//label[@for='product_uom_qty']"
-                position="attributes"
-            >
-                <attribute name="invisible">1</attribute>
-            </xpath>
-
-            <!-- Make order lines editable inline (no popup) -->
-            <xpath expr="//field[@name='order_line']" position="attributes">
-                <attribute name="mode">tree</attribute>
-            </xpath>
-            <xpath expr="//field[@name='order_line']//tree" position="attributes">
-                <attribute name="editable">bottom</attribute>
-            </xpath>
-        </field>
-    </record>
-
-    <!-- ============================================================ -->
-    <!-- Dedicated Rental Tree View                                   -->
-    <!-- ============================================================ -->
-    <record id="rental_order_view_tree" model="ir.ui.view">
-        <field name="name">sale.order.tree.rental</field>
-        <field name="model">sale.order</field>
-        <field name="arch" type="xml">
-            <tree decoration-muted="rental_status == 'cancel'">
-                <field name="is_rental_order" invisible="1" />
-                <field name="is_late" invisible="1" />
-                <field name="invoice_status" invisible="1" />
-                <field name="name" readonly="1" decoration-bf="1" />
-                <field name="partner_id" readonly="1" />
-                <field
-                    name="amount_total"
-                    sum="Total"
-                    widget="monetary"
-                    decoration-bf="1"
-                    decoration-info="invoice_status == 'to invoice'"
-                />
-                <field
-                    name="rental_status"
-                    widget="badge"
-                    decoration-muted="rental_status in ('draft', 'sent')"
-                    decoration-info="rental_status == 'pickup'"
-                    decoration-warning="rental_status == 'return'"
-                    decoration-success="rental_status == 'returned'"
-                    decoration-danger="rental_status == 'cancel'"
-                />
-                <field name="state" invisible="1" />
-                <field name="currency_id" invisible="1" />
-            </tree>
-        </field>
-    </record>
-
-    <!-- ============================================================ -->
-    <!-- Dedicated Rental Kanban View                                 -->
-    <!-- ============================================================ -->
-    <record id="rental_order_view_kanban" model="ir.ui.view">
-        <field name="name">sale.order.kanban.rental</field>
-        <field name="model">sale.order</field>
-        <field name="arch" type="xml">
-            <kanban quick_create="false" class="o_kanban_mobile align-content-start">
-                <field name="name" />
-                <field name="partner_id" />
-                <field name="next_action_date" />
-                <field name="rental_status" />
-                <field name="is_late" />
-                <field name="is_rental_order" />
-                <field name="amount_total" />
-                <field name="currency_id" />
-                <field name="state" />
-                <templates>
-                    <t t-name="kanban-box">
-                        <div class="oe_kanban_card oe_kanban_global_click h-100">
-                            <div class="oe_kanban_content d-flex flex-column h-100">
-                                <!-- Top: Partner name + Amount -->
-                                <div class="o_kanban_record_top mb-0">
-                                    <div class="o_kanban_record_headings">
-                                        <strong class="o_kanban_record_title">
-                                            <field name="partner_id" />
-                                        </strong>
-                                    </div>
-                                    <strong>
-                                        <field name="amount_total" widget="monetary" />
-                                    </strong>
-                                </div>
-                                <!-- Middle: Order number + next action -->
-                                <div class="o_kanban_record_body flex-grow-1">
-                                    <span class="text-muted">
-                                        <t t-out="record.name.value" />
-                                    </span>
-                                    <br />
-                                    <t t-if="record.next_action_date.value">
-                                        <span
-                                            t-attf-class="#{record.is_late.raw_value ? 'text-danger' : 'text-muted'}"
-                                        >
-                                            <t t-if="record.is_late.raw_value">
-                                                <i
-                                                    class="fa fa-warning me-1"
-                                                    title="Late"
-                                                />
-                                            </t>
-                                            <t
-                                                t-if="record.rental_status.raw_value == 'pickup'"
-                                            >Pickup: </t>
-                                            <t
-                                                t-if="record.rental_status.raw_value == 'return'"
-                                            >Return: </t>
-                                            <t t-out="record.next_action_date.value" />
-                                        </span>
-                                    </t>
-                                </div>
-                                <!-- Bottom: Status badge + Customer photo -->
-                                <div class="o_kanban_record_bottom">
-                                    <div
-                                        class="oe_kanban_bottom_left"
-                                        style="font-size: 1.5rem;"
-                                    >
-                                        <field
-                                            name="rental_status"
-                                            widget="label_selection"
-                                            options="{'classes': {
-                                                'draft': 'light',
-                                                'sent': 'light',
-                                                'pickup': 'info',
-                                                'return': 'warning',
-                                                'returned': 'success',
-                                                'cancel': 'danger'
-                                            }}"
-                                        />
-                                    </div>
-                                    <div class="oe_kanban_bottom_right">
-                                        <div
-                                            data-tooltip-template="web.ImageZoomTooltip"
-                                            t-att-data-tooltip-info="JSON.stringify({url: '/web/image/res.partner/' + record.partner_id.raw_value + '/image_1024'})"
-                                            data-tooltip-position="top"
-                                            data-tooltip-delay="300"
-                                        >
-                                            <img
-                                                t-att-src="kanban_image('res.partner', 'avatar_128', record.partner_id.raw_value)"
-                                                t-att-title="record.partner_id.value"
-                                                t-att-alt="record.partner_id.value"
-                                                class="rounded-circle"
-                                                style="width: 28px; height: 28px; object-fit: cover;"
-                                            />
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
-
-    <!-- ============================================================ -->
-    <!-- Dedicated Rental Calendar View                               -->
-    <!-- ============================================================ -->
-    <record id="rental_order_view_calendar" model="ir.ui.view">
-        <field name="name">sale.order.calendar.rental</field>
-        <field name="model">sale.order</field>
-        <field name="arch" type="xml">
-            <calendar
-                string="Rental Orders"
-                date_start="default_start_date"
-                date_stop="default_end_date"
-                color="rental_status"
-                mode="month"
-                quick_add="false"
-            >
-                <field name="partner_id" />
-                <field name="name" />
-                <field name="rental_status" />
-                <field name="amount_total" widget="monetary" />
-            </calendar>
-        </field>
-    </record>
-
-    <!-- ============================================================ -->
-    <!-- Dedicated Rental Search View                                 -->
-    <!-- ============================================================ -->
-    <record id="rental_order_view_search" model="ir.ui.view">
-        <field name="name">sale.order.search.rental</field>
-        <field name="model">sale.order</field>
-        <field name="priority">100</field>
-        <field name="arch" type="xml">
-            <search string="Search Rental Orders">
-                <field
-                    name="name"
-                    string="Order"
-                    filter_domain="['|', '|', ('name', 'ilike', self), ('client_order_ref', 'ilike', self), ('partner_id', 'child_of', self)]"
-                />
-                <field name="partner_id" operator="child_of" />
-                <field name="user_id" />
-                <field
-                    name="order_line"
-                    string="Product"
-                    filter_domain="[('order_line.product_id', 'ilike', self)]"
-                />
-                <filter
-                    string="My Orders"
-                    domain="[('user_id', '=', uid)]"
-                    name="my_rental_orders"
-                />
-                <separator />
-                <filter
-                    name="from_rental"
-                    string="Rentals"
-                    domain="[('is_rental_order', '=', True)]"
-                />
-                <separator />
-                <filter
-                    name="filter_today"
-                    string="To Do Today"
-                    domain="[('next_action_date', '=', context_today().strftime('%Y-%m-%d'))]"
-                />
-                <separator />
-                <filter
-                    name="filter_to_pickup"
-                    string="To Pickup"
-                    domain="[('rental_status', '=', 'pickup')]"
-                />
-                <filter
-                    name="filter_to_return"
-                    string="To Return"
-                    domain="[('rental_status', '=', 'return')]"
-                />
-                <separator />
-                <filter
-                    name="filter_late"
-                    string="Late"
-                    domain="[('rental_status', 'in', ['pickup', 'return']), ('next_action_date', '&lt;', context_today().strftime('%Y-%m-%d'))]"
-                />
-                <separator />
-                <filter
-                    string="Pickup Date"
-                    name="filter_pickup"
-                    date="default_start_date"
-                />
-                <filter
-                    string="Return Date"
-                    name="filter_return"
-                    date="default_end_date"
-                />
-                <separator />
-                <group expand="0" string="Group By">
-                    <filter
-                        string="Status"
-                        name="groupby_status"
-                        context="{'group_by': 'rental_status'}"
-                    />
-                    <separator />
-                    <filter
-                        string="Salesperson"
-                        name="salesperson"
-                        domain="[]"
-                        context="{'group_by': 'user_id'}"
-                    />
-                    <filter
-                        string="Customer"
-                        name="customer"
-                        domain="[]"
-                        context="{'group_by': 'partner_id'}"
-                    />
-                </group>
-                <searchpanel>
-                    <field name="rental_status" icon="fa-retweet" enable_counters="1" />
-                    <field
-                        name="invoice_status"
-                        icon="fa-retweet"
-                        enable_counters="1"
-                    />
-                </searchpanel>
-            </search>
-        </field>
-    </record>
-
-    <!-- ============================================================ -->
-    <!-- Actions                                                      -->
-    <!-- ============================================================ -->
-    <record id="rental_order_action" model="ir.actions.act_window">
-        <field name="name">Rental Orders</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
-        <field name="search_view_id" ref="rental_order_view_search" />
-        <field
-            name="context"
-            eval="{
-                'in_rental_app': 1,
-                'search_default_from_rental': 1,
-                'default_type_id': ref('rental_base.rental_sale_type'),
-            }"
-        />
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                Create a new rental order!
-            </p>
-        </field>
-    </record>
-    <record id="rental_order_action_view_kanban" model="ir.actions.act_window.view">
-        <field name="sequence">1</field>
-        <field name="view_mode">kanban</field>
-        <field name="view_id" ref="rental_order_view_kanban" />
-        <field name="act_window_id" ref="rental_order_action" />
-    </record>
-    <record id="rental_order_action_view_tree" model="ir.actions.act_window.view">
-        <field name="sequence">2</field>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="rental_order_view_tree" />
-        <field name="act_window_id" ref="rental_order_action" />
-    </record>
-    <record id="rental_order_action_view_form" model="ir.actions.act_window.view">
-        <field name="sequence">3</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="rental_order_form_view" />
-        <field name="act_window_id" ref="rental_order_action" />
-    </record>
-    <record id="rental_order_action_view_calendar" model="ir.actions.act_window.view">
-        <field name="sequence">4</field>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="rental_order_view_calendar" />
-        <field name="act_window_id" ref="rental_order_action" />
-    </record>
-
-    <!-- Today: Pickups -->
-    <record id="rental_order_today_pickup_action" model="ir.actions.act_window">
-        <field name="name">Pickups Today</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_mode">tree,kanban,form</field>
-        <field name="domain">[('is_rental_order', '=', True)]</field>
-        <field name="search_view_id" ref="rental_order_view_search" />
-        <field
-            name="context"
-            eval="{
-                'in_rental_app': 1,
-                'search_default_filter_today': 1,
-                'search_default_filter_to_pickup': 1,
-                'default_type_id': ref('rental_base.rental_sale_type'),
-            }"
-        />
-    </record>
-    <record
-        id="rental_order_today_pickup_action_view_tree"
-        model="ir.actions.act_window.view"
-    >
-        <field name="sequence">1</field>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="rental_order_view_tree" />
-        <field name="act_window_id" ref="rental_order_today_pickup_action" />
-    </record>
-    <record
-        id="rental_order_today_pickup_action_view_kanban"
-        model="ir.actions.act_window.view"
-    >
-        <field name="sequence">2</field>
-        <field name="view_mode">kanban</field>
-        <field name="view_id" ref="rental_order_view_kanban" />
-        <field name="act_window_id" ref="rental_order_today_pickup_action" />
-    </record>
-    <record
-        id="rental_order_today_pickup_action_view_form"
-        model="ir.actions.act_window.view"
-    >
-        <field name="sequence">3</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="rental_order_form_view" />
-        <field name="act_window_id" ref="rental_order_today_pickup_action" />
-    </record>
-
-    <!-- Today: Returns -->
-    <record id="rental_order_today_return_action" model="ir.actions.act_window">
-        <field name="name">Returns Today</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_mode">tree,kanban,form</field>
-        <field name="domain">[('is_rental_order', '=', True)]</field>
-        <field name="search_view_id" ref="rental_order_view_search" />
-        <field
-            name="context"
-            eval="{
-                'in_rental_app': 1,
-                'search_default_filter_today': 1,
-                'search_default_filter_to_return': 1,
-                'default_type_id': ref('rental_base.rental_sale_type'),
-            }"
-        />
-    </record>
-    <record
-        id="rental_order_today_return_action_view_tree"
-        model="ir.actions.act_window.view"
-    >
-        <field name="sequence">1</field>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="rental_order_view_tree" />
-        <field name="act_window_id" ref="rental_order_today_return_action" />
-    </record>
-    <record
-        id="rental_order_today_return_action_view_kanban"
-        model="ir.actions.act_window.view"
-    >
-        <field name="sequence">2</field>
-        <field name="view_mode">kanban</field>
-        <field name="view_id" ref="rental_order_view_kanban" />
-        <field name="act_window_id" ref="rental_order_today_return_action" />
-    </record>
-    <record
-        id="rental_order_today_return_action_view_form"
-        model="ir.actions.act_window.view"
-    >
-        <field name="sequence">3</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="rental_order_form_view" />
-        <field name="act_window_id" ref="rental_order_today_return_action" />
-    </record>
-
-    <!-- ============================================================ -->
-    <!-- Menus (Enterprise-style structure)                           -->
-    <!-- ============================================================ -->
-
-    <!-- Orders submenu group -->
-    <menuitem
-        id="menu_rental_order_group"
-        name="Orders"
-        parent="rental_base.menu_rental_root"
-        sequence="2"
-    />
-
-    <!-- Orders > Orders -->
-    <menuitem
-        id="menu_rental_orders"
-        name="Orders"
-        parent="menu_rental_order_group"
-        action="rental_order_action"
-        sequence="1"
-    />
-
-    <!-- Hide rental_base's separate Quotations/Orders menus (redundant,
-         our single "Orders" view with rental_status covers both) -->
-    <record id="rental_base.menu_rental_quotations" model="ir.ui.menu">
-        <field name="active" eval="False" />
-    </record>
-    <record id="rental_base.menu_rental_orders" model="ir.ui.menu">
-        <field name="active" eval="False" />
-    </record>
-
-    <!-- Hide sale_rental's menu item from the Sale app
-         (rental positions are accessed from the Rentals app) -->
-    <record id="sale_rental.sale_rental_menu" model="ir.ui.menu">
-        <field name="active" eval="False" />
-    </record>
-
-    <!-- Orders > To Do Today -->
-    <menuitem
-        id="menu_rental_today"
-        name="To Do Today"
-        parent="menu_rental_order_group"
-        sequence="3"
-    />
-
-    <!-- Orders > To Do Today > Pickup -->
-    <menuitem
-        id="menu_rental_today_pickup"
-        name="Pickup"
-        parent="menu_rental_today"
-        action="rental_order_today_pickup_action"
-        sequence="1"
-    />
-
-    <!-- Orders > To Do Today > Return -->
-    <menuitem
-        id="menu_rental_today_return"
-        name="Return"
-        parent="menu_rental_today"
-        action="rental_order_today_return_action"
-        sequence="2"
-    />
-
-</odoo>
diff --git a/sale_rental_extension/views/stock_picking_views.xml b/sale_rental_extension/views/stock_picking_views.xml
deleted file mode 100644
index f5f058ff3..000000000
--- a/sale_rental_extension/views/stock_picking_views.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
-     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-<odoo>
-    <record id="view_picking_form" model="ir.ui.view">
-        <field name="name">stock.picking.form.inherit.sale_rental_extension</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form" />
-        <field name="arch" type="xml">
-            <field name="origin" position="after">
-                <field name="is_rental_picking" invisible="1" />
-                <field name="is_signed" invisible="1" />
-                <field name="rental_require_signature_validation" invisible="1" />
-            </field>
-            <!-- Hide Validate (highlighted) when rental outgoing + require signature -->
-            <xpath
-                expr="//button[@name='button_validate'][hasclass('oe_highlight')]"
-                position="attributes"
-            >
-                <attribute name="attrs">{
-                    'invisible': [
-                        '|', '|',
-                        ('state', 'in', ('waiting', 'confirmed')),
-                        ('show_validate', '=', False),
-                        '&amp;', '&amp;',
-                        ('is_rental_picking', '=', True),
-                        ('rental_require_signature_validation', '=', True),
-                        ('picking_type_code', '=', 'outgoing'),
-                    ],
-                }</attribute>
-            </xpath>
-            <!-- Hide Validate (non-highlighted) when rental outgoing + require signature -->
-            <xpath
-                expr="//button[@name='button_validate'][hasclass('o_btn_validate')]"
-                position="attributes"
-            >
-                <attribute name="attrs">{
-                    'invisible': [
-                        '|', '|',
-                        ('state', 'not in', ('waiting', 'confirmed')),
-                        ('show_validate', '=', False),
-                        '&amp;', '&amp;',
-                        ('is_rental_picking', '=', True),
-                        ('rental_require_signature_validation', '=', True),
-                        ('picking_type_code', '=', 'outgoing'),
-                    ],
-                }</attribute>
-            </xpath>
-            <!-- Hide Sign (highlighted, state=done) when rental + require signature + already signed -->
-            <xpath expr="//widget[@name='signature'][@highlight]" position="attributes">
-                <attribute name="attrs">{
-                    'invisible': [
-                        '|', '|', '|',
-                        ('id', '=', False),
-                        ('picking_type_code', '!=', 'outgoing'),
-                        ('state', '!=', 'done'),
-                        '&amp;', '&amp;',
-                        ('is_rental_picking', '=', True),
-                        ('rental_require_signature_validation', '=', True),
-                        ('is_signed', '=', True),
-                    ],
-                }</attribute>
-            </xpath>
-            <!-- Hide Sign (non-highlighted, state!=done) when rental + require signature -->
-            <xpath
-                expr="//widget[@name='signature'][not(@highlight)]"
-                position="attributes"
-            >
-                <attribute name="attrs">{
-                    'invisible': [
-                        '|', '|', '|',
-                        ('id', '=', False),
-                        ('picking_type_code', '!=', 'outgoing'),
-                        ('state', '=', 'done'),
-                        '&amp;',
-                        ('is_rental_picking', '=', True),
-                        ('rental_require_signature_validation', '=', True),
-                    ],
-                }</attribute>
-            </xpath>
-            <!-- Add new highlighted Sign widget for rental auto-validate
-                 (placed before Validate so it takes its position when Validate is hidden) -->
-            <xpath
-                expr="//button[@name='button_validate'][hasclass('oe_highlight')]"
-                position="before"
-            >
-                <widget
-                    name="signature"
-                    string="Sign"
-                    highlight="1"
-                    attrs="{
-                        'invisible': [
-                            '|', '|', '|', '|', '|',
-                            ('id', '=', False),
-                            ('picking_type_code', '!=', 'outgoing'),
-                            ('state', '=', 'done'),
-                            ('is_rental_picking', '=', False),
-                            ('rental_require_signature_validation', '=', False),
-                            ('show_validate', '=', False),
-                        ],
-                    }"
-                    full_name="partner_id"
-                    groups="stock.group_stock_sign_delivery"
-                />
-            </xpath>
-        </field>
-    </record>
-</odoo>